diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 18:07:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 18:07:15 -0700 |
commit | 26b0332e30c7f93e780aaa054bd84e3437f84354 (patch) | |
tree | e9cf240b67bf7eebae9fabbdba4e6a0fdfd359d7 /net/atm/signaling.h | |
parent | 640414171818c6293c23e74a28d1c69b2a1a7fe5 (diff) | |
parent | 4a43f394a08214eaf92cdd8ce3eae75e555323d8 (diff) | |
download | linux-26b0332e30c7f93e780aaa054bd84e3437f84354.tar.bz2 |
Merge tag 'dmaengine-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine
Pull dmaengine update from Dan Williams:
"Collection of random updates to the core and some end-driver fixups
for ioatdma and mv_xor:
- NUMA aware channel allocation
- Cleanup dmatest debugfs interface
- ioat: make raid-support Atom only
- mv_xor: big endian
Aside from the top three commits these have all had some soak time in
-next. The top commit fixes a recent build breakage.
It has been a long while since my last pull request, hopefully it does
not show. Thanks to Vinod for keeping an eye on drivers/dma/ this
past year"
* tag 'dmaengine-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
dmaengine: dma_sync_wait and dma_find_channel undefined
MAINTAINERS: update email for Dan Williams
dma: mv_xor: Fix incorrect error path
ioatdma: silence GCC warnings
dmaengine: make dma_channel_rebalance() NUMA aware
dmaengine: make dma_submit_error() return an error code
ioatdma: disable RAID on non-Atom platforms and reenable unaligned copies
mv_xor: support big endian systems using descriptor swap feature
mv_xor: use {readl, writel}_relaxed instead of __raw_{readl, writel}
dmatest: print message on debug level in case of no error
dmatest: remove IS_ERR_OR_NULL checks of debugfs calls
dmatest: make module parameters writable
Diffstat (limited to 'net/atm/signaling.h')
0 files changed, 0 insertions, 0 deletions