Merge branch 'for-2.6.40' into for-2.6.41
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 30 May 2011 02:54:18 +0000 (10:54 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 30 May 2011 02:54:18 +0000 (10:54 +0800)
commitd21685ec258f803d3badae5eae821383a34815a9
tree7ab60a2a5d557a4f345b01a79ca2f877c06d9b92
parent74ab24af4fe165de5af01d0507250dd099f096b0
parentea02c63d57d7ec099f66ddb2942b4022e865cd5f
Merge branch 'for-2.6.40' into for-2.6.41
sound/soc/codecs/max98088.c
sound/soc/codecs/max98095.c
sound/soc/soc-cache.c
sound/soc/soc-core.c