David S. Miller d4a66e752d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/benet/be_cmds.h include/linux/sysctl.h		2010-01-10 22:55:03 -08:00
..
avm	pcmcia: remove unused IRQ_FIRST_SHARED	2009-12-07 22:23:24 +01:00
eicon	Merge branch 'for-next' into for-linus	2009-12-07 18:36:35 +01:00
mISDN	drivers/isdn: eliminate duplicated test	2010-01-03 21:25:54 -08:00
Kconfig
Makefile