Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 19 Jan 2011 14:50:22 +0000 (14:50 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 19 Jan 2011 14:50:22 +0000 (14:50 +0000)
commite66ef2f81f1d36b5413e3fc7ff548de683f0750b
treee2adec7e3cfc1f759c0368570307fce507e09d2e
parent474b62d6eee733abdcd36f8e3e5ce504fbb9110b
parent78b3fb46753872fc79bffecc8d50355a8622b39b
Merge branch 'for-2.6.38' into for-2.6.39
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8995.c