aha/arch
Linus Torvalds ca1ee219c0 Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
  intel-iommu: Fix address wrap on 32-bit kernel.
  intel-iommu: Enable DMAR on 32-bit kernel.
  intel-iommu: fix PCI device detach from virtual machine
  intel-iommu: VT-d page table to support snooping control bit
  iommu: Add domain_has_cap iommu_ops
  intel-iommu: Snooping control support

Fixed trivial conflicts in arch/x86/Kconfig and drivers/pci/intel-iommu.c
2009-04-03 10:36:57 -07:00
..
alpha Allow rwlocks to re-enable interrupts 2009-04-02 19:05:11 -07:00
arm Merge master.kernel.org:/home/rmk/linux-2.6-arm 2009-04-03 09:05:40 -07:00
avr32 Simplify copy_thread() 2009-04-02 19:04:51 -07:00
blackfin Simplify copy_thread() 2009-04-02 19:04:51 -07:00
cris Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2009-04-02 21:09:10 -07:00
frv Simplify copy_thread() 2009-04-02 19:04:51 -07:00
h8300 Simplify copy_thread() 2009-04-02 19:04:51 -07:00
ia64 ia64: implement interrupt-enabling rwlocks 2009-04-02 19:05:11 -07:00
m32r Simplify copy_thread() 2009-04-02 19:04:51 -07:00
m68k Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc 2009-04-03 09:51:35 -07:00
m68knommu Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2009-04-03 09:44:58 -07:00
mips Allow rwlocks to re-enable interrupts 2009-04-02 19:05:11 -07:00
mn10300 Simplify copy_thread() 2009-04-02 19:04:51 -07:00
parisc Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 2009-04-03 09:52:04 -07:00
powerpc Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc 2009-04-03 09:51:35 -07:00
s390 Allow rwlocks to re-enable interrupts 2009-04-02 19:05:11 -07:00
sh Allow rwlocks to re-enable interrupts 2009-04-02 19:05:11 -07:00
sparc Allow rwlocks to re-enable interrupts 2009-04-02 19:05:11 -07:00
um Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/linux-hdreg-h-cleanup 2009-04-03 09:02:32 -07:00
x86 Merge git://git.infradead.org/iommu-2.6 2009-04-03 10:36:57 -07:00
xtensa Simplify copy_thread() 2009-04-02 19:04:51 -07:00
.gitignore
Kconfig dma-debug: add Kconfig entry 2009-03-05 14:36:50 +01:00