Linus Torvalds ff1ea52fa3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 ... * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: fix APIC related bootup crash on Athlon XP CPUs time: add ADJ_OFFSET_SS_READ x86: export the symbol empty_zero_page on the 32-bit x86 architecture x86: fix kprobes_64.c inlining borkage pci: use pci=bfsort for HP DL385 G2, DL585 G2 x86: correctly set UTS_MACHINE for "make ARCH=x86" lockdep: annotate do_debug() trap handler x86: turn off iommu merge by default x86: fix ACPI compile for LOCAL_APIC=n x86: printk kernel version in WARN_ON and other dump_stack users ACPI: Set max_cstate to 1 for early Opterons. x86: fix NMI watchdog & 'stopped time' problem		2007-11-26 19:41:28 -08:00
..
boot	x86: do not use $(ARCH) when not needed	2007-11-12 21:02:20 +01:00
configs	x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU	2007-10-30 00:22:22 +01:00
crypto	x86: merge arch/x86/crypto Makefiles	2007-10-23 22:37:23 +02:00
ia32	x86 - 32-bit ptrace emulation mishandles 6th arg	2007-11-10 04:30:36 +01:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86	2007-11-26 19:41:28 -08:00
lguest	lguest: tidy up documentation	2007-11-05 21:55:57 +11:00
lib	x86: disable preemption in delay_tsc()	2007-11-14 18:45:44 -08:00
mach-default	spelling fixes: arch/i386/	2007-10-20 01:13:56 +02:00
mach-es7000	i386: es7000 minor cleanups	2007-10-17 20:16:15 +02:00
mach-generic	spelling fixes: arch/i386/	2007-10-20 01:13:56 +02:00
mach-visws	[x86] remove uses of magic macros for boot_params access	2007-10-16 17:38:31 -07:00
mach-voyager	x86: fix smp init sections	2007-11-17 16:27:00 +01:00
math-emu	kbuild: fix up CFLAGS usage	2007-10-14 21:49:42 +02:00
mm	Merge branch 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep	2007-11-03 12:42:52 -07:00
oprofile	x86: add instrumentation menu	2007-10-23 22:37:22 +02:00
pci	Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86	2007-11-26 19:41:28 -08:00
power	i386: move power	2007-10-11 11:16:34 +02:00
vdso	x86: ignore the sys_getcpu() tcache parameter	2007-11-17 16:27:00 +01:00
video	i386: move video	2007-10-11 11:16:56 +02:00
xen	[SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate	2007-10-23 19:53:17 -04:00
Kconfig	x86: simplify "make ARCH=x86" and fix kconfig all.config	2007-11-17 17:21:54 +01:00
Kconfig.cpu	x86: arch/x86/Kconfig.cpu unification	2007-11-12 21:02:19 +01:00
Kconfig.debug	remove the dead X86_REMOTE_DEBUG option	2007-10-30 00:22:22 +01:00
Makefile	x86: correctly set UTS_MACHINE for "make ARCH=x86"	2007-11-26 17:38:53 -08:00
Makefile_32	x86: do not use $(ARCH) when not needed	2007-11-12 21:02:20 +01:00
Makefile_32.cpu	x86: move i386 and x86_64 Makefiles to arch/x86	2007-10-25 22:27:34 +02:00
Makefile_64	x86: do not use $(ARCH) when not needed	2007-11-12 21:02:20 +01:00