]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'stable/for-linus-3.13' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 8 Nov 2013 21:17:14 +0000 (16:17 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 8 Nov 2013 21:17:14 +0000 (16:17 -0500)
commit2458b107ee35b4b0f377ad634416dc1b8b482305
tree65d3c7e76e9ab93b76723f88f4b7b44587f7272b
parentdf3a9d6a1842d24f388be8040dfe7be15dc485a8
parentffc555be09bd2603abdbc6f8b64c6a7477facc48
Merge branch 'stable/for-linus-3.13' into linux-next

* stable/for-linus-3.13:
  arm,arm64/include/asm/io.h: define struct bio_vec
  swiotlb-xen: missing include dma-direction.h
  pci-swiotlb-xen: call pci_request_acs only ifdef CONFIG_PCI
  arm: make SWIOTLB available

Conflicts:
drivers/xen/swiotlb-xen.c