David S. Miller ba3e2084f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv6/xfrm6_output.c net/openvswitch/flow_netlink.c net/openvswitch/vport-gre.c net/openvswitch/vport-vxlan.c net/openvswitch/vport.c net/openvswitch/vport.h The openvswitch conflicts were overlapping changes. One was the egress tunnel info fix in 'net' and the other was the vport ->send() op simplification in 'net-next'. The xfrm6_output.c conflicts was also a simplification overlapping a bug fix. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-24 06:54:12 -07:00
..
act2000
capi	isdn/capi: Use setup_timer	2015-05-31 21:36:37 -07:00
divert
gigaset	isdn/gigaset: drop unused ldisc methods	2015-07-15 17:24:45 -07: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-10-24 06:54:12 -07:00
hysdn	isdn: fix misspelling of current function in string	2014-12-09 16:18:46 -05:00
i4l	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2015-06-23 14:08:54 -07: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	drivers: isdn: isdnloop: isdnloop.c: Remove parenthesis around return values, as specified in CodingStyle.	2015-02-05 15:40:23 -08:00
mISDN	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07: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
Makefile