diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-05 19:19:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-05 19:19:32 +0100 |
| commit | 53a61d967a480307db4c8f7950ddb8bb1a0fda9b (patch) | |
| tree | 6b3ce07b14db2986a175f30e6477ed40445c7c17 /sound/soc/pxa | |
| parent | 8876698406147986a9a7748586a54c4b14514c0e (diff) | |
| parent | 5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5 (diff) | |
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
Diffstat (limited to 'sound/soc/pxa')
0 files changed, 0 insertions, 0 deletions