OpenCloudOS-Kernel/drivers/isdn/hardware/mISDN
David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c
2011-06-20 22:29:08 -07:00
..
Kconfig isdn: fix netjet/isdnhdlc build errors 2009-09-28 12:47:36 -07:00
Makefile mISDN: Add support for Traverse Technologies NETJet PCI cards 2009-07-25 20:22:36 +02:00
avmfritz.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
hfc_multi.h mISDN: Add XHFC support for embedded Speech-Design board to hfcmulti 2009-05-25 00:55:30 -07:00
hfc_multi_8xx.h mISDN: Add XHFC support for embedded Speech-Design board to hfcmulti 2009-05-25 00:55:30 -07:00
hfc_pci.h mISDN: Add different different timer settings for hfc-pci 2009-01-09 22:44:28 +01:00
hfcmulti.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
hfcpci.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
hfcsusb.c ISDN, hfcsusb: Don't leak in hfcsusb_ph_info() 2011-06-11 18:59:07 -07:00
hfcsusb.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
iohelper.h mISDN: Fix wrong struct name in macro and clarifications 2009-07-27 08:20:55 -07:00
ipac.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
isar.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
mISDNinfineon.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
mISDNipac.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
mISDNisar.c drivers/isdn: Remove unnecessary semicolons 2010-11-15 11:06:17 -08:00
netjet.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
netjet.h mISDN: Add support for Traverse Technologies NETJet PCI cards 2009-07-25 20:22:36 +02:00
speedfax.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
w6692.c net: remove interrupt.h inclusion from netdevice.h 2011-06-06 22:55:11 -07:00
w6692.h mISDN: Add driver for Winbond cards 2009-07-25 20:21:28 +02:00