David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx4/main.c net/packet/af_packet.c Both conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-24 02:58:51 -07:00
..
act2000	isdn: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04:00
capi	isdn/capi: Use setup_timer	2015-05-31 21:36:37 -07:00
divert	isdn: divert, hysdn: fix interruptible_sleep_on race	2014-02-26 16:06:13 -05:00
gigaset	isdn/gigaset: restructure modem response parser (4)	2015-03-23 16:47:24 -04:00
hardware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2015-04-14 09:50:27 -07:00
hisax	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-24 02:58:51 -07:00
hysdn	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -05:00
i4l	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
icn	isdn: icn: use strlcpy() when parsing setup options	2015-03-15 22:24:37 -04:00
isdnloop	drivers: isdn: isdnloop: isdnloop.c: Remove parenthesis around return values, as specified in CodingStyle.	2015-02-05 15:40:23 -08:00
mISDN	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
pcbit	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -05:00
sc	Drivers: Isdn: sc: Fixed coding style & spelling mistakes.	2015-01-18 00:27:53 -05:00
Kconfig	tty: Added a CONFIG_TTY option to allow removal of TTY	2013-01-18 16:15:27 -08:00
Makefile	mISDN fix main ISDN Makefile	2008-08-02 16:28:20 +02:00