Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 02:43:43 +0000 (16:43 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 02:43:43 +0000 (16:43 -1000)
commit7f3bf7cd348cead84f8027b32aa30ea49fa64df5
treed2f68190c64a7598fff040a8895103031551e2f2
parentcbc158d6bfa1990f7869717bb5270867c66068d1
parent21ef4b8b7a7d59a995bf44382de38c95587767d4
Merge branch 'next' of git://git./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
drivers/dma/dmaengine.c
include/linux/pci_ids.h