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	ISDN: ARRAY_SIZE changes	2009-07-25 20:23:05 +02:00
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	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00
hysdn	isdn: convert to netdev_tx_t	2009-09-01 01:13:16 -07:00
i4l	isdn: fix possible circular locking dependency	2009-10-22 18:27:53 -07:00
icn	fix ! versus & precedence in various places	2008-02-06 10:40:59 -08:00
isdnloop	drivers/isdn: correct use of ! and &	2008-03-04 16:35:16 -08:00
mISDN	net: mark net_proto_ops as const	2009-10-07 01:10:46 -07:00
pcbit	isdn: remove some pointless conditionals before kfree_skb()	2009-02-26 23:07:29 -08:00
sc	ISDN: fix sc/shmem printk format warning	2009-02-20 00:54:44 -08:00
Kconfig	ISDN: Make isdnhdlc usable for other ISDN drivers	2009-07-25 20:15:21 +02:00
Makefile	mISDN fix main ISDN Makefile	2008-08-02 16:28:20 +02:00