aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-04 16:43:43 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-04 16:43:43 -1000
commit7f3bf7cd348cead84f8027b32aa30ea49fa64df5 (patch)
treed2f68190c64a7598fff040a8895103031551e2f2 /mm
parentcbc158d6bfa1990f7869717bb5270867c66068d1 (diff)
parent21ef4b8b7a7d59a995bf44382de38c95587767d4 (diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: dmaengine: use DEFINE_IDR for static initialization ioat: fix xor_idx_to_desc Avoid section type conflict in dma/ioat/dma_v3.c ioat: Adding PCI IDs for IOAT devices on SandyBridge platforms
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions