diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-07-31 12:06:43 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-07-31 12:06:43 +0100 |
| commit | 0e52d987c0b242fe3fe4c8e9732bd663cce0e50b (patch) | |
| tree | 5c510c7b8d819a68afb29b3769c069585cbc0095 /include | |
| parent | 89269ef1f0abc72c551198123e19cd4edfd43cf4 (diff) | |
| parent | a068682cd69461911407411b4198248a87c583e2 (diff) | |
| parent | d94443256f8f19732f0b95f65ec344c17751aa15 (diff) | |
| download | linux-0e52d987c0b242fe3fe4c8e9732bd663cce0e50b.tar.gz linux-0e52d987c0b242fe3fe4c8e9732bd663cce0e50b.tar.bz2 linux-0e52d987c0b242fe3fe4c8e9732bd663cce0e50b.zip | |
Merge branches 'dma-omap', 'dma-pl08x' and 'dma-sa11x0' into dmaengine