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
..
amiga	m68k: cnt reaches -1, not 0	2009-08-26 23:14:49 +02:00
apollo	m68k: apollo core - Kill warn_unused_result warnings	2009-01-12 20:56:35 +01:00
atari	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
bvme6000	m68k: Kill several external declarations in source files	2009-01-12 20:56:34 +01:00
configs	m68k: Update defconfigs for 2.6.30-rc3	2009-04-22 20:55:12 +02:00
fpsp040	m68k: fix trigraph ignored warning in setox.S	2008-12-28 20:00:05 +01:00
hp300	m68k: hp300 core - Kill warn_unused_result warnings	2009-01-12 20:56:36 +01:00
ifpsp060	Stringify support commas	2008-07-20 17:24:38 -07:00
include/asm	net: Generalize socket rx gap / receive queue overflow cmsg	2009-10-12 13:26:31 -07:00
kernel	headers: utsname.h redux	2009-09-23 18:13:10 -07:00
lib	Stringify support commas	2008-07-20 17:24:38 -07:00
mac	m68k: mac - Add SWIM floppy support	2009-03-26 21:15:27 +01:00
math-emu	locking, m68k/asm-offsets: Rename signal defines	2009-09-01 09:38:03 +02:00
mm	arches: drop superfluous casts in nr_free_pages() callers	2009-09-22 07:17:34 -07:00
mvme16x	m68k: Kill several external declarations in source files	2009-01-12 20:56:34 +01:00
mvme147	m68k: mvme147 core - Kill warn_unused_result warnings	2009-01-12 20:56:37 +01:00
q40	m68k: Kill several external declarations in source files	2009-01-12 20:56:34 +01:00
sun3	m68k: sun3 core - Kill warn_unused_result warnings	2009-01-12 20:56:38 +01:00
sun3x	m68k: Kill several external declarations in source files	2009-01-12 20:56:34 +01:00
tools/amiga	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
Kconfig	tty: Mark generic_serial users as BROKEN	2009-10-30 14:43:12 -07:00
Kconfig.debug	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	m68k: Add install target	2009-03-26 21:15:26 +01:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00