David S. Miller c649c0e31d Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c		2009-05-25 01:42:21 -07:00
..
act2000	drivers/isdn/act2000: fix sparse warning: symbol shadows an earlier one	2009-02-27 01:00:41 -08:00
capi	Fix the race between capifs remount and node creation	2009-05-09 10:51:34 -04:00
divert	isdn: use non-racy method for proc entries creation	2008-04-29 08:06:22 -07:00
gigaset	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-05-25 01:42:21 -07:00
hardware	mISDN: Added PCI ID for new Junghanns.net Single E1 cards.	2009-05-25 00:56:56 -07:00
hisax	USB: add reset endpoint operations	2009-04-17 10:50:27 -07:00
hysdn	hysdn: convert to net_device_ops and other updates	2009-01-07 18:03:43 -08:00
i4l	gigaset: move up Kconfig inclusion point	2009-05-17 20:51:26 -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	mISDN: Fix DTMF detection enable/disable	2009-05-25 00:55:47 -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	gigaset: move up Kconfig inclusion point	2009-05-17 20:51:26 -07:00
Makefile	mISDN fix main ISDN Makefile	2008-08-02 16:28:20 +02:00