David S. Miller a2bfbc072e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/can/Kconfig		2009-11-17 00:05:02 -08: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: convert strcmp chain to table lookup	2009-10-29 01:37:18 -07:00
hardware	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-17 00:05:02 -08:00
hisax	hisax: remove bad udelay call to fix build error on ARM	2009-11-06 20:33:41 -08:00
hysdn	isdn: convert to netdev_tx_t	2009-09-01 01:13:16 -07:00
i4l	Revert "isdn: isdn_ppp: Use SKB list facilities instead of home-grown implementation."	2009-11-15 22:23:47 -08: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	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-06 00:55:55 -08: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