linux/arch/ia64
Ingo Molnar f0ef039851 Merge branch 'x86/core' into tracing/textedit
Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-06 16:45:01 +01:00
..
configs [IA64] fixes configs and add default config for ia64 xen domU 2009-02-19 11:39:06 -08:00
dig [IA64] Add Variable Page Size and IA64 Support in Intel IOMMU 2008-10-17 12:14:13 -07:00
hp Documentation: move DMA-mapping.txt to Doc/PCI/ 2009-01-29 18:19:29 -08:00
ia32 [CVE-2009-0029] Remove __attribute__((weak)) from sys_pipe/sys_pipe2 2009-01-14 14:15:15 +01:00
include/asm Merge branch 'x86/core' into tracing/textedit 2009-03-06 16:45:01 +01:00
kernel Merge branch 'x86/core' into tracing/textedit 2009-03-06 16:45:01 +01:00
kvm KVM: Add kvm_arch_sync_events to sync with asynchronize events 2009-02-15 02:47:36 +02:00
lib [IA64] Add Variable Page Size and IA64 Support in Intel IOMMU 2008-10-17 12:14:13 -07:00
mm mm: fix memmap init for handling memory hole 2009-02-18 15:37:55 -08:00
oprofile oprofile: more whitespace fixes 2008-10-15 20:55:51 +02:00
pci [IA64] SN specific version of dma_get_required_mask() 2009-01-15 10:42:16 -08:00
scripts ia64/pv_ops: paravirtualized instruction checker. 2008-10-17 10:12:54 -07:00
sn Merge branch 'linus' into x86/apic 2009-02-22 20:05:19 +01:00
uv [IA64] Simplify SGI uv vs. sn2 driver issues 2008-11-04 11:29:39 -08:00
xen [IA64] xen_domu build fix 2009-02-19 12:05:00 -08:00
install.sh Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig Merge branches 'tracing/ftrace' and 'linus' into tracing/core 2009-02-27 09:04:43 +01:00
Kconfig.debug [PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu 2005-11-07 07:53:35 -08:00
Makefile Pull vtd-iommu into release branch 2008-10-17 13:52:22 -07:00
module.lds Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00