David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-15 13:32:48 -04:00
..
asm-generic	asm-generic: use compat version for preadv2 and pwritev2	2016-05-05 00:42:20 +02:00
drm	Merge tag 'topic/drm-misc-2016-03-14' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-03-16 11:09:26 +10:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -04:00
misc	cxl: Support to flash a new image on the adapter from a guest	2016-03-09 23:39:56 +11:00
mtd	mtd: mtd-user: remove stdint.h include	2015-10-19 18:19:06 -07:00
rdma	Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6	2016-03-21 17:32:23 -04:00
scsi	cxlflash: Fix to avoid virtual LUN failover failure	2016-01-06 20:50:08 -05:00
sound	ALSA: seq: Provide card number / PID via sequencer client info	2016-03-08 10:52:52 +01:00
video	…
xen	xen/gntdev: add ioctl for grant copy	2016-01-07 13:21:53 +00:00
Kbuild	…