David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/infiniband/hw/cxgb4/device.c The cxgb4 conflict was simply overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-07-22 00:44:59 -07:00
..
isdn_audio.c	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_audio.h
isdn_bsdcomp.c	isdn: remove duplicate NULL check	2012-05-17 04:47:50 -04:00
isdn_common.c	isdn: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04:00
isdn_common.h	TTY: switch tty_insert_flip_string	2013-01-15 22:22:35 -08:00
isdn_concap.c	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_concap.h	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_net.c	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
isdn_net.h	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_ppp.c	net: ppp: fix creating PPP pass and active filters	2014-07-16 23:42:06 -07:00
isdn_ppp.h	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_tty.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-04-30 09:36:50 -07:00
isdn_tty.h	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_ttyfax.c	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_ttyfax.h	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_v110.c	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_v110.h	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_x25iface.c	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
isdn_x25iface.h	wanrouter: completely decouple obsolete code from kernel.	2013-01-31 19:20:33 -05:00
isdnhdlc.c	isdn: whitespace coding style cleanup	2012-02-21 09:04:01 -08:00
Kconfig	isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES	2012-11-07 18:59:26 -05:00
Makefile	ISDN: Make isdnhdlc usable for other ISDN drivers	2009-07-25 20:15:21 +02:00