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
..
acpi	Merge branch 'linus' into test	2008-10-23 00:11:07 -04:00
asm-arm	[ARM] S3C24XX: Additional include moves	2008-10-07 23:09:51 +01:00
asm-cris	container freezer: add TIF_FREEZE flag to all architectures	2008-10-20 08:52:33 -07:00
asm-frv	ide: fix support for IDE PCI controllers using MMIO on frv	2008-10-17 18:09:14 +02:00
asm-generic	mutex: speed up generic mutex implementations	2008-10-23 09:18:20 -07:00
asm-h8300	h8300: update timer handler - new files	2008-10-16 11:21:29 -07:00
asm-m32r	[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY	2008-10-16 15:40:05 +02:00
asm-m68k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6	2008-10-20 13:12:39 -07:00
asm-mn10300	[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY	2008-10-16 15:40:05 +02:00
asm-xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6	2008-10-23 09:16:56 -07:00
crypto
drm	radeon: fix PCI bus mastering support enables.	2008-10-18 07:10:54 +10:00
keys
linux	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2008-10-23 10:20:36 -07:00
math-emu
media	V4L/DVB (9335): videobuf: split unregister bus creating self-contained frontend de-allocator	2008-10-21 14:32:08 -02:00
mtd
net	9p: fix sparse warnings	2008-10-22 18:54:47 -05:00
pcmcia
rdma
rxrpc
scsi	[SCSI] iscsi_tcp: return a descriptive error value during connection errors	2008-10-13 09:29:00 -04:00
sound	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2008-10-13 14:03:59 -07:00
trace	sched: clean up tracepoints	2008-10-14 10:33:14 +02:00
video	video: add sh_mobile_lcdc platform flags	2008-10-20 11:38:50 +09:00
xen
Kbuild