tree 6b3ce07b14db2986a175f30e6477ed40445c7c17
parent 8876698406147986a9a7748586a54c4b14514c0e
parent 5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5
author Mark Brown <broonie@opensource.wolfsonmicro.com> 1270491572 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> 1270491572 +0100

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