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_cs.c	pcmcia: do not use io_req_t when calling pcmcia_request_io()	2010-08-03 09:04:11 +02:00
avmcard.h	proc_fops: convert drivers/isdn/ to seq_file	2010-01-14 03:10:54 -08:00
b1.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
b1dma.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
b1isa.c	proc_fops: convert drivers/isdn/ to seq_file	2010-01-14 03:10:54 -08:00
b1pci.c	proc_fops: convert drivers/isdn/ to seq_file	2010-01-14 03:10:54 -08:00
b1pcmcia.c	proc_fops: convert drivers/isdn/ to seq_file	2010-01-14 03:10:54 -08:00
c4.c	isdn: avm: call pci_disable_device() if pci_probe() failed	2010-08-10 02:51:10 -07:00
Kconfig	isdn/avm: fix build when PCMCIA is not enabled	2010-08-22 21:37:33 -07:00
Makefile
t1isa.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
t1pci.c	isdn: avm: call pci_disable_device() if pci_probe() failed	2010-08-10 02:51:10 -07:00