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
..
asm-generic	arm64: Fix MINSIGSTKSZ and SIGSTKSZ	2015-10-12 17:40:12 +01:00
drm	uapi/drm/i915_drm.h: fix userspace compilation.	2015-09-02 16:26:58 +03:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
misc	cxl: Add alternate MMIO error handling	2015-08-18 19:34:43 +10:00
mtd	mtd: lpddr: add driver for LPDDR2-NVM PCM memories	2014-05-20 17:45:17 -07:00
rdma	IB/hfi1: Add PSM2 user space header to header_install	2015-09-03 15:29:52 -04:00
scsi	cxlflash: Virtual LUN support	2015-08-26 18:05:39 -07:00
sound	ASoC: Disable topology support for v4.2	2015-08-19 18:31:54 +02:00
video
xen	xen/privcmd: Further s/MFN/GFN/ clean-up	2015-09-08 18:03:54 +01:00
Kbuild	cxl: Add userspace header file	2014-10-08 20:15:57 +11:00