diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-04-09 12:37:25 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-04-09 12:37:25 +0100 |
| commit | 8a9024d86769573cbf5d2d7477b4d446c5309e7c (patch) | |
| tree | e7fafaa75c61c7bad82bc20148d72bcc191698ec /include/sound/dmaengine_pcm.h | |
| parent | 0301daae021d0b80f4dca30f8c2b50e08e44fa5a (diff) | |
| parent | b600627667fd261b130d2535dcc1a1da1261e246 (diff) | |
Merge branch 'lsk-3.10-armlt-dma' into integration-lsk-3.10-juno-android
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'include/sound/dmaengine_pcm.h')
0 files changed, 0 insertions, 0 deletions