linux/arch
Linus Torvalds 26f0cf9181 Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  x86: Detect whether we should use Xen SWIOTLB.
  pci-swiotlb-xen: Add glue code to setup dma_ops utilizing xen_swiotlb_* functions.
  swiotlb-xen: SWIOTLB library for Xen PV guest with PCI passthrough.
  xen/mmu: inhibit vmap aliases rather than trying to clear them out
  vmap: add flag to allow lazy unmap to be disabled at runtime
  xen: Add xen_create_contiguous_region
  xen: Rename the balloon lock
  xen: Allow unprivileged Xen domains to create iomap pages
  xen: use _PAGE_IOMAP in ioremap to do machine mappings

Fix up trivial conflicts (adding both xen swiotlb and xen pci platform
driver setup close to each other) in drivers/xen/{Kconfig,Makefile} and
include/xen/xen-ops.h
2010-08-12 09:09:41 -07:00
..
alpha dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
arm Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 2010-08-11 09:17:27 -07:00
avr32 dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
blackfin dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
cris dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
frv dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
h8300 Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
ia64 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2010-08-11 09:23:32 -07:00
m32r Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
m68k dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
m68knommu time: Kill off CONFIG_GENERIC_TIME 2010-07-27 12:40:54 +02:00
microblaze dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
mips dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
mn10300 dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
parisc parisc: fix wrong page aligned size calculation in ioremapping code 2010-08-12 08:43:29 -07:00
powerpc dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
s390 Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
score score: fix dereference of NULL pointer in local_flush_tlb_page() 2010-08-12 08:43:29 -07:00
sh Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-11 09:13:19 -07:00
sparc dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
tile dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
um dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
x86 Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 2010-08-12 09:09:41 -07:00
xtensa dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
.gitignore
Kconfig Merge branch 'perf/nmi' into perf/core 2010-08-05 08:45:05 +02:00