Commits

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
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