David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
act2000
capi	isdn/capi: Use setup_timer	2015-05-31 21:36:37 -07:00
divert
gigaset	ser_gigaset: remove unnecessary kfree() calls from release method	2015-12-15 13:24:21 -05:00
hardware	mISDN: fix a loop count	2015-12-15 12:42:27 -05:00
hisax	isdn: Partially revert debug format string usage clean up	2015-11-25 11:49:58 -05:00
hysdn
i4l	isdn: remove spellcaster driver	2015-12-01 16:06:44 -05:00
icn	arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead	2015-08-10 23:07:05 -04:00
isdnloop
mISDN	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
pcbit
Kconfig
Makefile	isdn: remove spellcaster driver	2015-12-01 16:06:44 -05:00