]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df3a9d6 ffc555b)
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)
* 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


Trivial merge
Linux kernel for KaRo TX COM modules