David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		2009-11-18 22:19:03 -08:00
..
boot	x86: Document linker script ASSERT() quirk	2009-10-16 07:18:46 +02:00
configs
crypto	crypto: aesni-intel - Fix irq_fpu_usable usage	2009-10-20 16:20:47 +09:00
ia32	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
kernel	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
kvm	KVM: get_tss_base_addr() should return a gpa_t	2009-11-04 12:42:36 -02:00
lguest
lib	x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y	2009-10-01 08:42:24 +02:00
math-emu
mm	x86: Fix error return sequence in __ioremap_caller()	2009-11-08 12:48:58 +01:00
oprofile
pci	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
power
vdso
video
xen	xen: mask extended topology info in cpuid	2009-11-03 11:09:12 -08:00
Kbuild
Kconfig	x86: Remove STACKPROTECTOR_ALL	2009-10-23 16:35:23 +02:00
Kconfig.cpu	x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium	2009-10-26 12:33:02 +01:00
Kconfig.debug
Makefile	x86: Remove STACKPROTECTOR_ALL	2009-10-23 16:35:23 +02:00
Makefile_32.cpu