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
..
asm-generic	mm: mlock: add mlock flags to enable VM_LOCKONFAULT usage	2015-11-05 19:34:48 -08:00
drm	Merge tag 'topic/drm-fixes-2015-11-11' of git://anongit.freedesktop.org/drm-intel into drm-fixes	2015-11-13 09:54:31 +10:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
misc	cxl: Add alternate MMIO error handling	2015-08-18 19:34:43 +10:00
mtd	mtd: mtd-user: remove stdint.h include	2015-10-19 18:19:06 -07:00
rdma	Initial 4.4 merge window submission	2015-11-07 13:33:07 -08:00
scsi	cxlflash: Virtual LUN support	2015-08-26 18:05:39 -07:00
sound	ASoC: Updates for v4.4	2015-10-26 12:14:49 +01:00
video
xen	xen/gntdev: use types from linux/types.h in userspace headers	2015-10-23 14:20:45 +01:00
Kbuild