aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-07-31 12:06:43 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-07-31 12:06:43 +0100
commit0e52d987c0b242fe3fe4c8e9732bd663cce0e50b (patch)
tree5c510c7b8d819a68afb29b3769c069585cbc0095 /Documentation
parent89269ef1f0abc72c551198123e19cd4edfd43cf4 (diff)
parenta068682cd69461911407411b4198248a87c583e2 (diff)
parentd94443256f8f19732f0b95f65ec344c17751aa15 (diff)
downloadlinux-linaro-stable-0e52d987c0b242fe3fe4c8e9732bd663cce0e50b.tar.gz
Merge branches 'dma-omap', 'dma-pl08x' and 'dma-sa11x0' into dmaengine