Linus Torvalds 269b012321 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu: (89 commits) AMD IOMMU: remove now unnecessary #ifdefs AMD IOMMU: prealloc_protection_domains should be static kvm/iommu: fix compile warning AMD IOMMU: add statistics about total number of map requests AMD IOMMU: add statistics about allocated io memory AMD IOMMU: add stats counter for domain tlb flushes AMD IOMMU: add stats counter for single iommu domain tlb flushes AMD IOMMU: add stats counter for cross-page request AMD IOMMU: add stats counter for free_coherent requests AMD IOMMU: add stats counter for alloc_coherent requests AMD IOMMU: add stats counter for unmap_sg requests AMD IOMMU: add stats counter for map_sg requests AMD IOMMU: add stats counter for unmap_single requests AMD IOMMU: add stats counter for map_single requests AMD IOMMU: add stats counter for completion wait events AMD IOMMU: add init code for statistic collection AMD IOMMU: add necessary header defines for stats counting AMD IOMMU: add Kconfig entry for statistic collection code AMD IOMMU: use dev_name in iommu_enable function AMD IOMMU: use calc_devid in prealloc_protection_domains ...		2009-01-03 12:03:52 -08:00
..
boot	Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core	2008-12-23 16:27:23 +01:00
configs	x86: revert CONFIG_RELOCATABLE=y defconfig change	2008-12-18 20:57:29 +01:00
crypto	crypto: crc32c-intel - Switch to shash	2008-12-25 11:01:37 +11:00
ia32	x86: introducing asm/sys_ia32.h	2008-12-29 13:18:40 +01:00
include/asm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu	2009-01-03 12:03:52 -08:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu	2009-01-03 12:03:52 -08:00
kvm	KVM: change KVM to use IOMMU API	2009-01-03 14:11:07 +01:00
lguest	Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-02 11:44:09 -08:00
lib	Merge commit 'v2.6.28-rc2' into core/locking	2008-10-28 16:54:49 +01:00
mach-default	x86: mach-default setup.c cleanups	2008-12-29 13:18:39 +01:00
mach-generic	x86 smp: modify send_IPI_mask interface to accept cpumask_t pointers	2008-12-16 17:40:56 -08:00
mach-rdc321x	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
mach-voyager	x86: prepare for cpumask iterators to only go to nr_cpu_ids	2008-12-16 17:40:58 -08:00
math-emu	x86: coding style fixes to arch/x86/math-emu/reg_constant	2008-06-18 15:00:13 +02:00
mm	Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-02 11:44:09 -08:00
oprofile	Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-12-30 17:31:25 -08:00
pci	x86, pci: move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h	2008-12-29 18:17:36 +01:00
power	x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set	2008-11-12 23:28:51 +01:00
scripts	allow stripping of generated symbols under CONFIG_KALLSYMS_ALL	2008-12-19 22:47:10 +01:00
vdso	Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6	2008-12-28 12:33:21 -08:00
video
xen	Merge branch 'cputime' of git://git390.osdl.marist.edu/pub/scm/linux-2.6	2009-01-03 11:56:24 -08:00
Kconfig	Merge branches 'iommu/api' and 'iommu/amd' into for-linus	2009-01-03 16:43:44 +01:00
Kconfig.cpu	Revert "x86: disable X86_PTRACE_BTS"	2008-12-24 21:08:37 +01:00
Kconfig.debug	Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-12-28 12:21:10 -08:00
Makefile	x86, um: ... and asm-x86 move	2008-10-22 22:55:20 -07:00
Makefile_32.cpu	x86: merge winchip-2 and winchip-2a cpu choices	2008-10-13 10:22:48 +02:00