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	arch/sparc/boot/*.c: Mark various internal functions static	2009-11-15 15:01:40 -08:00
configs	sparc: Update defconfigs.	2009-09-16 00:31:26 -07: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
lib	sparc64: Fix section attribute warnings.	2009-05-29 16:12:02 -07:00
math-emu
mm	sparc64: Fix D-cache flushing on swapin from SW devices.	2009-10-12 03:20:57 -07:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc64: Fix bootup with mcount in some configs.	2009-09-04 03:39:45 -07:00
Kconfig	Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-10-08 12:05:50 -07:00
Kconfig.debug
Makefile	arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0	2009-09-20 12:28:22 +02:00