original_kernel/drivers/isdn/i4l
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
..
Kconfig
Makefile
isdn_audio.c
isdn_audio.h
isdn_bsdcomp.c
isdn_common.c
isdn_common.h
isdn_concap.c
isdn_concap.h
isdn_net.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-18 23:38:23 -08:00
isdn_net.h isdn: use %pI4, remove get_{u8/u16/u32} and put_{u8/u16/u32} inlines 2008-11-13 22:41:29 -08:00
isdn_ppp.c
isdn_ppp.h
isdn_tty.c
isdn_tty.h
isdn_ttyfax.c
isdn_ttyfax.h
isdn_v110.c
isdn_v110.h
isdn_x25iface.c
isdn_x25iface.h