Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 May 2011 22:30:36 +0000 (23:30 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 May 2011 22:30:36 +0000 (23:30 +0100)
commit20ed0938bfb132638f68618ba2e694aafe24d3e2
tree938d33049fe8158d02d6d81b44986a5cf421359c
parente1a02066080da55026c193603c7468c2d95d14a9
parent9ab88434e8b5ffc5a638b5b1d3b9a67dceb28e5d
Merge branch 'for-2.6.39' into for-2.6.40
sound/soc/mid-x86/sst_platform.c
sound/soc/soc-core.c