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	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
configs	xtensa: enable m41t80 driver in s6105_defconfig	2009-06-22 02:38:11 -07:00
include/asm	net: Introduce recvmmsg socket syscall	2009-10-12 23:40:10 -07:00
kernel	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
lib	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
mm	arches: drop superfluous casts in nr_free_pages() callers	2009-09-22 07:17:34 -07:00
platforms	net: convert remaining non-symbolic return values in ndo_start_xmit() functions	2009-07-05 19:23:38 -07:00
variants	xtensa: support s6000 gpio irqs and alternate function selection	2009-06-22 02:37:26 -07:00
Kconfig	xtensa: implement ccount calibration for s6000	2009-05-11 22:00:17 -07:00
Kconfig.debug
Makefile	xtensa: only build platform or variant if they contain a Makefile	2009-04-03 00:06:45 -07:00