Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Apr 2011 23:27:06 +0000 (08:27 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Apr 2011 23:27:06 +0000 (08:27 +0900)
commitd9b3e4c5156476a4baf0d7e0f47ba2816b4fff8e
treec0dc062c3e318b1b429b489bdbdda411e16053e2
parentfb631eae1f2171033327e1b9ab427d4a113dc179
parentbaa8160382e2818179d025063697ce0a471ec48f
Merge branch 'for-2.6.39' into for-2.6.40
sound/soc/codecs/wm8994.c
sound/soc/soc-core.c