From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Aug 2011 02:43:43 +0000 (-1000)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
X-Git-Tag: Ubuntu-5.2.0-15.16~19910
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7f3bf7cd348cead84f8027b32aa30ea49fa64df5;p=mirror_ubuntu-eoan-kernel.git

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

7f3bf7cd348cead84f8027b32aa30ea49fa64df5