Merge branch 'for-2.6.34' into for-2.6.35
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Apr 2010 18:19:32 +0000 (19:19 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Apr 2010 18:19:32 +0000 (19:19 +0100)
commit53a61d967a480307db4c8f7950ddb8bb1a0fda9b
tree6b3ce07b14db2986a175f30e6477ed40445c7c17
parent8876698406147986a9a7748586a54c4b14514c0e
parent5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5
Merge branch 'for-2.6.34' into for-2.6.35

Conflicts due to context changes next to the backported DMA data change:
include/sound/soc.h
include/sound/soc.h
sound/soc/codecs/wm8994.c