Joerg Roedel f93ea73387 Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next ... Conflicts: drivers/iommu/amd_iommu.c drivers/iommu/intel-iommu.c include/linux/iommu.h		2012-01-09 13:06:28 +01:00
..
configs	Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux	2011-11-02 16:52:17 -07:00
dig	iommu: Rename the DMAR and INTR_REMAP config options	2011-09-21 10:22:03 +02:00
hp	ia64: Add export.h to arch/ia64 specific files as required	2011-10-31 19:30:58 -04:00
include/asm	Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next	2012-01-09 13:06:28 +01:00
kernel	iommu: Add option to group multi-function devices	2011-11-15 12:22:31 +01:00
kvm	iommu/core: Convert iommu_found to iommu_present	2011-10-21 14:37:20 +02:00
lib	Fix common misspellings	2011-03-31 11:26:23 -03:00
mm	mm: now that all old mmu_gather code is gone, remove the storage	2011-05-25 08:39:16 -07:00
oprofile	[IA64] fix build warning in arch/ia64/oprofile/backtrace.c	2011-04-07 11:05:56 -07:00
pci	ia64: Add export.h to arch/ia64 specific files as required	2011-10-31 19:30:58 -04:00
scripts	scripts: change scripts to use system python instead of env	2010-02-02 14:33:56 +01:00
sn	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
uv	ia64: change to new flag variables	2011-03-17 14:02:56 +01:00
xen	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux	2011-11-02 16:52:17 -07:00
Kconfig.debug	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
Makefile	Merge commit 'v2.6.35' into kbuild/kbuild	2010-08-04 13:59:13 +02:00
module.lds