forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Browse source 
Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
	sound/soc/codecs/wm8994.c
This commit is contained in:
Mark Brown 2011-04-18 18:07:43 +01:00
commit d5381e42f6
3008 changed files with 10041 additions and 9777 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/mfd/wm8350/pmic.h
View file

@ -1,5 +1,5 @@
/*
* pmic.h -- Power Managment Driver for Wolfson WM8350 PMIC
* pmic.h -- Power Management Driver for Wolfson WM8350 PMIC
*
* Copyright 2007 Wolfson Microelectronics PLC
*