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
capi
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
hysdn
i4l
icn
isdnloop
mISDN	mISDN: Fix DTMF detection enable/disable	2009-05-25 00:55:47 -07:00
pcbit
sc
Kconfig
Makefile