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
..
acpi	ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()	2015-09-15 03:05:45 +02:00
asm-generic	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01: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	drm/dp/mst: make mst i2c transfer code more robust.	2015-10-15 09:06:20 +10:00
dt-bindings	Merge branch 'drivers/reset' into next/late	2015-09-09 15:42:45 -07:00
keys	…
kvm	arm/arm64: KVM: Remove 'config KVM_ARM_MAX_VCPUS'	2015-09-17 13:13:27 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
math-emu	…
media	media updates for v4.3-rc1	2015-09-11 16:42:39 -07:00
memory	…
misc	…
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07: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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
video	libnvdimm for 4.3:	2015-09-08 14:35:59 -07:00
xen	x86/xen: Support kexec/kdump in HVM guests by doing a soft reset	2015-09-28 14:48:52 +01:00
Kbuild	…