kernel-fxtec-pro1x/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
..
isdn_audio.c
isdn_audio.h
isdn_bsdcomp.c
isdn_common.c Merge commit 'v2.6.26' into bkl-removal 2008-07-14 15:29:34 -06:00
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: isdn_ppp: Use SKB list facilities instead of home-grown implementation. 2008-09-22 01:15:02 -07:00
isdn_ppp.h
isdn_tty.c tty/serial: lay the foundations for the next set of reworks 2008-04-30 08:29:45 -07:00
isdn_tty.h
isdn_ttyfax.c drivers/isdn: correct use of ! and & 2008-03-04 16:35:16 -08:00
isdn_ttyfax.h
isdn_v110.c isdn: replace __inline with inline 2008-03-05 18:37:39 -08:00
isdn_v110.h
isdn_x25iface.c
isdn_x25iface.h
Kconfig
Makefile