Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 18 Jan 2011 19:11:23 +0000 (19:11 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 18 Jan 2011 19:11:23 +0000 (19:11 +0000)
commit492e917635a0fa05439bb562fd51577efc9cef30
tree31557bd3b15e1d79d7287cc3d7ded3875cbeea92
parent065ae6784f03016ed1c0613863461a162388cf5a
parentc88c2823e87dd6f8214b8b8cdc36d45f205a8077
Merge branch 'for-2.6.38' into for-2.6.39
sound/soc/codecs/Kconfig