Linus Torvalds 5b34653963 Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) x86: canonicalize remaining header guards x86: drop double underscores from header guards x86: Fix ASM_X86__ header guards x86, um: get rid of uml-config.h x86, um: get rid of arch/um/Kconfig.arch x86, um: get rid of arch/um/os symlink x86, um: get rid of excessive includes of uml-config.h x86, um: get rid of header symlinks x86, um: merge Kconfig.i386 and Kconfig.x86_64 x86, um: get rid of sysdep symlink x86, um: trim the junk from uml ptrace-*.h x86, um: take vm-flags.h to sysdep x86, um: get rid of uml asm/arch x86, um: get rid of uml highmem.h x86, um: get rid of uml unistd.h x86, um: get rid of system.h -> system.h include x86, um: uml atomic.h is not needed anymore x86, um: untangle uml ldt.h x86, um: get rid of more uml asm/arch uses x86, um: remove dead header (uml module-generic.h; never used these days) ...		2008-10-23 10:22:01 -07:00
..
boot	powerpc: Add del_node() for early boot code to prune inapplicable devices.	2008-10-22 15:01:21 +11:00
configs	powerpc/40x: Add support for Netstal HCU4 board	2008-10-17 13:28:05 -04:00
include/asm	Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-23 10:22:01 -07:00
kernel	Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-23 10:22:01 -07:00
kvm	KVM: switch to get_user_pages_fast	2008-10-15 14:25:06 +02:00
lib	powerpc: Fix DMA offset for non-coherent DMA	2008-10-14 10:35:26 +11:00
math-emu	powerpc/math-emu: Use kernel generic math-emu code	2008-10-01 08:40:07 -05:00
mm	powerpc: Don't use a 16G page if beyond mem= limits	2008-10-22 15:01:21 +11:00
oprofile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile	2008-10-23 10:05:40 -07:00
platforms	powerpc: Support for relocatable kdump kernel	2008-10-22 15:01:22 +11:00
sysdev	Merge commit 'origin' into master	2008-10-21 15:52:04 +11:00
xmon	Merge branch 'linux-2.6'	2008-06-30 10:16:50 +10:00
Kconfig	powerpc: Support for relocatable kdump kernel	2008-10-22 15:01:22 +11:00
Kconfig.debug	powerpc: Split-out common MSI bitmap logic into msi_bitmap.c	2008-08-20 16:34:57 +10:00
Makefile	powerpc: Enforce a non-spe kernel build even on broken compilers	2008-09-15 11:08:41 -07:00