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
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
i4l	gigaset: move up Kconfig inclusion point	2009-05-17 20:51:26 -07:00
icn
isdnloop
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
Kconfig	gigaset: move up Kconfig inclusion point	2009-05-17 20:51:26 -07:00
Makefile