Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Apr 2011 20:29:24 +0000 (13:29 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 11 Apr 2011 20:29:24 +0000 (13:29 -0700)
commita19809875fb0952631767e2d2484bcd81b4365a1
treef922fe27fd150560b079a5a140c8c7a5f39ca9ac
parent70da1dc052349b75a91fea1198258c99cea03390
parent39cca168bdfaef9d0c496ec27f292445d6184946
Merge branch 'for-2.6.39' into for-2.6.40
sound/soc/codecs/sn95031.c
sound/soc/mid-x86/sst_platform.c