From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 8 Nov 2013 21:17:14 +0000 (-0500)
Subject: Merge branch 'stable/for-linus-3.13' into linux-next
X-Git-Tag: next-20131128~16^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2458b107ee35b4b0f377ad634416dc1b8b482305;p=karo-tx-linux.git

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

2458b107ee35b4b0f377ad634416dc1b8b482305