Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2011-08-04 16:43:43 -10:00

parent cbc158d6bf 21ef4b8b7a

commit 7f3bf7cd34

4 changed files with 26 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/dma/dmaengine.c

View file

8

drivers/dma/ioat/dma_v3.c

View file

11

drivers/dma/ioat/pci.c

View file