You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 0cfdc72439 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu ... * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (33 commits) iommu/core: Remove global iommu_ops and register_iommu iommu/msm: Use bus_set_iommu instead of register_iommu iommu/omap: Use bus_set_iommu instead of register_iommu iommu/vt-d: Use bus_set_iommu instead of register_iommu iommu/amd: Use bus_set_iommu instead of register_iommu iommu/core: Use bus->iommu_ops in the iommu-api iommu/core: Convert iommu_found to iommu_present iommu/core: Add bus_type parameter to iommu_domain_alloc Driver core: Add iommu_ops to bus_type iommu/core: Define iommu_ops and register_iommu only with CONFIG_IOMMU_API iommu/amd: Fix wrong shift direction iommu/omap: always provide iommu debug code iommu/core: let drivers know if an iommu fault handler isn't installed iommu/core: export iommu_set_fault_handler() iommu/omap: Fix build error with !IOMMU_SUPPORT iommu/omap: Migrate to the generic fault report mechanism iommu/core: Add fault reporting mechanism iommu/core: Use PAGE_SIZE instead of hard-coded value iommu/core: use the existing IS_ALIGNED macro iommu/msm: ->unmap() should return order of unmapped page ... Fixup trivial conflicts in drivers/iommu/Makefile: "move omap iommu to dedicated iommu folder" vs "Rename the DMAR and INTR_REMAP config options" just happened to touch lines next to each other.		13 years ago
..
alpha	Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux	13 years ago
arm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	13 years ago
avr32	All Arch: remove linkage for sys_nfsservctl system call	14 years ago
blackfin	Blackfin: irq: remove IRQF_DISABLED	13 years ago
cris	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	13 years ago
frv	All Arch: remove linkage for sys_nfsservctl system call	14 years ago
h8300	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	13 years ago
ia64	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	13 years ago
m32r	m32r: Allow use of atomic64	13 years ago
m68k	Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu	13 years ago
microblaze	microblaze: add missing CONFIG_ prefixes	13 years ago
mips	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound	13 years ago
mn10300	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	13 years ago
openrisc	doc: fix broken references	14 years ago
parisc	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue	13 years ago
powerpc	Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm	13 years ago
s390	Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm	13 years ago
score	modules: make arch's use default loader hooks	14 years ago
sh	net: sh_eth: move the asm/sh_eth.h to include/linux/	14 years ago
sparc	compat: sync compat_stats with statfs.	13 years ago
tile	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	13 years ago
um	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	13 years ago
unicore32	doc: fix broken references	14 years ago
x86	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	13 years ago
xtensa	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	13 years ago
.gitignore	…
Kconfig	…