Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)
commita1926d1745114789687ac029ae8c58944b7d2256
treec303e75615e378451a80b97bfd2c1ba54029d9bb
parent492e917635a0fa05439bb562fd51577efc9cef30
parent52fc43f7c1c416b114e88ff39635c36e67ef15b6
Merge branch 'for-2.6.38' into for-2.6.39
sound/soc/codecs/max98088.c
sound/soc/samsung/smdk_spdif.c