David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-01-28 10:33:06 -05:00

..

acpi

…

asm-generic

…

clocksource

…

crypto

…

drm

Merge tag 'drm-misc-fixes-2017-01-23' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes

2017-01-27 10:16:56 +10:00

dt-bindings

…

keys

…

kvm

…

linux

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

2017-01-28 10:33:06 -05:00

math-emu

…

media

…

memory

…

misc

…

net

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

2017-01-28 10:33:06 -05:00

pcmcia

…

ras

…

rdma

RDMA/core: Add the function ib_mtu_int_to_enum

2017-01-24 15:34:22 -05:00

rxrpc

…

scsi

Merge remote-tracking branch 'mkp-scsi/fixes' into fixes

2017-01-17 17:32:54 -05:00

soc

…

sound

…

target

…

trace

bpf: add initial bpf tracepoints

2017-01-25 13:17:47 -05:00

uapi

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

2017-01-28 10:33:06 -05:00

video

…

xen

…

Kbuild

…