David S. Miller cfadf853f6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sh_eth.c		2009-10-27 01:03:26 -07:00
..
act2000
capi	isdn: make capidrv module parameter "debugmode" writeable	2009-10-06 22:20:55 -07:00
divert	headers: remove sched.h from poll.h	2009-10-04 15:05:10 -07:00
gigaset	gigaset: add Kernel CAPI interface (v3)	2009-10-06 22:43:53 -07:00
hardware	isdn: fix netjet/isdnhdlc build errors	2009-09-28 12:47:36 -07:00
hisax
hysdn
i4l	isdn: fix possible circular locking dependency	2009-10-22 18:27:53 -07:00
icn
isdnloop
mISDN	net: mark net_proto_ops as const	2009-10-07 01:10:46 -07:00
pcbit
sc
Kconfig
Makefile