diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-05-14 16:31:44 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-05-14 16:31:44 +0100 |
| commit | ce79567a1c0967f49fb2761c18ec5bf82d0f40be (patch) | |
| tree | 374587c3bc2f82f81fc9bd86f1ce423a7b9d9208 /sound/soc/soc-generic-dmaengine-pcm.c | |
| parent | 19ed044e81485904bd64ee17f5c8712231ed620d (diff) | |
| parent | 77ecd1bf7b0ef85aaf7e0d444cba6192da56dad6 (diff) | |
Merge branch 'lsk-3.10-armlt-dma' into integration-lsk-3.10-juno-android-new
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'sound/soc/soc-generic-dmaengine-pcm.c')
0 files changed, 0 insertions, 0 deletions