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
..
acpi	ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()	2015-09-15 03:05:45 +02:00
asm-generic	Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm	2015-09-19 19:13:03 -07:00
clocksource
crypto	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2015-09-08 12:41:25 -07:00
drm	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2015-09-04 15:49:32 -07:00
dt-bindings	Merge branch 'drivers/reset' into next/late	2015-09-09 15:42:45 -07:00
keys	PKCS#7: Appropriately restrict authenticated attributes and content type	2015-08-12 17:01:01 +01:00
kvm	arm/arm64: KVM: Remove 'config KVM_ARM_MAX_VCPUS'	2015-09-17 13:13:27 +01: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
math-emu
media	media updates for v4.3-rc1	2015-09-11 16:42:39 -07:00
memory
misc	cxl: Allow the kernel to trust that an image won't change on PERST.	2015-08-14 21:32:07 +10:00
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
pcmcia
ras
rdma	Changes for 4.3-rc1	2015-09-19 20:04:11 -07:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-09-11 19:00:42 -07:00
soc	IOMMU Updates for Linux v4.3	2015-09-08 17:22:35 -07:00
sound	ALSA: hda - Fix missing inline for dummy snd_hdac_set_codec_wakeup()	2015-09-02 12:24:55 +02:00
target	target: Propigate backend read-only to core_tpg_add_lun	2015-09-24 23:17:21 -07:00
trace	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-09-11 16:13:47 -07:00
uapi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
video	libnvdimm for 4.3:	2015-09-08 14:35:59 -07:00
xen	xen: MFN/GFN/BFN terminology changes for 4.3-rc0	2015-09-10 16:21:11 -07:00
Kbuild