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

..

acpi

Merge branch 'acpi-pci'

2015-11-07 01:30:10 +01:00

asm-generic

treewide: Remove old email address

2015-11-23 09:44:58 +01:00

clocksource

…

crypto

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2015-11-05 15:32:38 -08:00

drm

drm/nouveau: Fix pre-nv50 pageflip events (v4)

2015-12-04 13:49:38 +10:00

dt-bindings

ARM: DT updates for v4.4

2015-11-10 15:06:26 -08:00

keys

…

kvm

KVM: arm/arm64: arch_timer: Preserve physical dist. active state on LR.active

2015-11-24 18:07:40 +01:00

linux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-17 22:08:28 -05:00

math-emu

…

media

…

memory

…

misc

…

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-17 22:08:28 -05:00

pcmcia

…

ras

…

rdma

IB/mad: Require CM send method for everything except ClassPortInfo

2015-12-08 12:19:11 -05:00

rxrpc

…

scsi

Merge branch 'mkp-fixes' into fixes

2015-12-03 09:32:33 -08:00

soc

ARM: SoC driver updates for v4.4

2015-11-10 15:00:03 -08:00

sound

ALSA: hda - Fix playback noise with 24/32 bit sample size on BXT

2015-12-07 09:04:44 +01:00

target

target: Fix race for SCF_COMPARE_AND_WRITE_POST checking

2015-11-28 19:33:15 -08:00

trace

net: IPv6 fib lookup tracepoint

2015-11-22 11:54:10 -05:00

uapi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-17 22:08:28 -05:00

video

gpu: ipu-v3: drop unused dmfc field from client platform data

2015-11-24 11:30:15 +01:00

xen

…

Kbuild

…