original_kernel/drivers/isdn
David S. Miller 198d6ba4d7 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c
2008-11-18 23:38:23 -08:00
..
act2000
capi device create: misc: convert device_create_drvdata to device_create 2008-10-16 09:24:43 -07:00
divert
gigaset tty: fix up gigaset a bit 2008-10-13 09:51:44 -07:00
hardware Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2008-10-13 14:12:40 -07:00
hisax
hysdn
i4l Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-18 23:38:23 -08:00
icn
isdnloop
mISDN mISDN/dsp_cmx.c: fix size checks 2008-10-13 18:42:55 -07:00
pcbit
sc
Kconfig
Makefile