Merge branch 'upstream/wm8711' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 21 Sep 2009 11:54:21 +0000 (04:54 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 21 Sep 2009 11:54:21 +0000 (04:54 -0700)
commite0274b0a300e58cad19ab347566c68762bb22d2c
tree01f454f10fe5ad3525b06d2f1fc9319157012d9d
parentd62ab3589462d406e98731799361f46095467882
parentb5ab887e6dfa12c32ef39827da47d5d021320a3f
Merge branch 'upstream/wm8711' into for-2.6.33
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile