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
..
boards	favr32: improve touchscreen response	2009-07-27 13:16:45 +02:00
boot	avr32: remove .note.gnu.build-id section when making vmlinux.bin	2008-12-17 11:44:10 +01:00
configs	avr32: Add support for Mediama RMTx add-on board for ATNGW100	2009-06-08 12:55:35 +02:00
include/asm	net: Generalize socket rx gap / receive queue overflow cmsg	2009-10-12 13:26:31 -07:00
kernel	net: Introduce recvmmsg socket syscall	2009-10-12 23:40:10 -07:00
lib	avr32/lib: fix unaligned memcpy where len < 4	2009-07-27 12:37:28 +02:00
mach-at32ap	at91: at91sam9g45 family: identify several chip versions	2009-11-03 18:42:31 +01:00
mm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	2009-09-23 15:37:02 -07:00
oprofile	Add kernel support for oprofile callgraphs on AVR32	2008-09-22 09:51:01 +02:00
Kconfig	Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2009-04-05 11:15:28 -07:00
Kconfig.debug	[AVR32] Include instrumentation menu	2008-01-25 08:31:40 +01:00
Makefile	avr32: drop unused CLEAN_FILES	2009-05-01 10:54:00 +02:00