diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:25:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:25:29 +0100 |
| commit | 5561f17f2629cdacf5bc43e0f839ca6434db2c20 (patch) | |
| tree | c0e1acfcc969c81d5d072ee3b512a934d99a7ec2 /sound | |
| parent | 423a5e0fd46de6bd92c52b2ef136856929eeb649 (diff) | |
| parent | d486fea6babfe3ff0c382c9e4baf18f535fcee7d (diff) | |
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'sound')
143 files changed, 3189 insertions, 1479 deletions
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c index 30184a4a147a..bb07989762d5 100644 --- a/sound/soc/atmel/atmel-pcm-dma.c +++ b/sound/soc/atmel/atmel-pcm-dma.c @@ -6 |