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)
1  2 
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile

Simple merge
Simple merge