Pablo Neira Ayuso f0a0a978b6 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... This merge resolves conflicts with 75aec9df3a ("bridge: Remove br_nf_push_frag_xmit_sk") as part of Eric Biederman's effort to improve netns support in the network stack that reached upstream via David's net-next tree. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Conflicts: net/bridge/br_netfilter_hooks.c		2015-10-17 14:28:03 +02:00
..
asm-generic	userfaultfd: register uapi generic syscall (aarch64)	2015-09-22 15:09:53 -07:00
drm	uapi/drm/i915_drm.h: fix userspace compilation.	2015-09-02 16:26:58 +03:00
linux	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
misc	cxl: Add alternate MMIO error handling	2015-08-18 19:34:43 +10:00
mtd
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