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
..
appldata	s390: use RCU to walk list of network devices	2009-11-10 22:26:31 -08:00
boot	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
crypto	crypto: sha-s390 - Fix warnings in import function	2009-09-05 16:27:35 +10:00
hypfs	[S390] hypfs: Use subcode 6 if subcode 7 is not available	2009-10-14 12:43:52 +02: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	[S390] s390: fix single stepping on svc0	2009-11-13 15:45:03 +01:00
kvm	KVM: s390: fix memsize >= 4G	2009-10-04 13:57:23 +02:00
lib	[S390] Add EX_TABLE for addressing exception in usercopy functions.	2009-10-06 10:35:10 +02:00
math-emu	[S390] remove -traditional	2008-04-30 13:38:44 +02:00
mm	[S390] fix build breakage with CONFIG_AIO=n	2009-10-06 10:35:05 +02:00
oprofile	Combine instrumentation menus in kernel/Kconfig.instrumentation	2007-10-19 11:53:54 -07:00
Kconfig	perf: Do the big rename: Performance Counters -> Performance Events	2009-09-21 14:28:04 +02:00
Kconfig.debug	generic debug pagealloc: build fix	2009-04-02 19:04:48 -07:00
Makefile	[S390] hibernation: merge files and move to kernel/	2009-09-11 10:29:45 +02:00
defconfig	[S390] Update default configuration.	2009-09-22 22:58:46 +02:00