David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/infiniband/core/iwcm.c drivers/net/chelsio/cxgb2.c drivers/net/wireless/bcm43xx/bcm43xx_main.c drivers/net/wireless/prism54/islpci_eth.c drivers/usb/core/hub.h drivers/usb/input/hid-core.c net/core/netpoll.c Fix up merge failures with Linus's head and fix new compilation failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-05 14:37:56 +00:00
..
boot	[PATCH] x86-64: shorten the x86_64 boot setup GDT to what the comment says	2006-11-14 16:57:46 +01:00
crypto	[CRYPTO] api: Get rid of flags argument to setkey	2006-09-21 11:41:02 +10:00
ia32	[PATCH] x86-64: Fix PTRACE_[SG]ET_THREAD_AREA regression with ia32 emulation.	2006-11-14 16:57:46 +01:00
kernel	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
lib	[NET]: X86_64 checksum annotations and cleanups.	2006-12-02 21:23:14 -08:00
mm	[PATCH] x86_64: fix memory hotplug build with NUMA=n	2006-11-20 09:42:05 -08:00
oprofile	[PATCH] Move Kprobes and Oprofile to "Instrumentation Support" menu	2005-11-07 07:53:35 -08:00
pci	Revert "[PATCH] MMCONFIG and new Intel motherboards"	2006-11-14 16:56:33 +01:00
defconfig	[PATCH] x86-64: Update defconfig	2006-10-21 18:37:00 +02:00
Kconfig	more misc typo fixes	2006-10-03 22:34:14 +02:00
Kconfig.debug	[PATCH] lockdep: irqtrace subsystem, x86_64 support	2006-07-03 15:27:03 -07:00
Makefile	[PATCH] x86_64: fix CONFIG_CC_STACKPROTECTOR build bug	2006-11-16 14:00:25 -08:00