linux/drivers/isdn/hardware
David S. Miller 2d4833aae6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	include/linux/if_pppox.h

Fix conflict between Changli's __packed header file fixes and
the new PPTP driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-22 22:37:04 -07:00
..
avm Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-08-22 22:37:04 -07:00
eicon isdn/hardware/eicon: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) 2010-07-15 19:05:23 -07:00
mISDN isdn: mISDN: call pci_disable_device() if pci_probe() failed 2010-08-10 02:51:11 -07:00
Kconfig
Makefile Add mISDN driver 2008-07-27 01:46:33 +02:00