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

..

asm-generic

tcp: SOF_TIMESTAMPING_OPT_STATS option for SO_TIMESTAMPING

2016-11-30 10:04:25 -05:00

drm

Merge tag 'drm-vc4-next-2016-12-09' of https://github.com/anholt/linux into drm-next

2016-12-13 12:05:12 +10:00

linux

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

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

misc

cxl: Use fixed width predefined types in data structure.

2016-08-09 16:52:01 +10:00

mtd

mtd: kill the nand_ecclayout struct

2016-05-05 23:51:51 +02:00

rdma

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

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

scsi

Add type 0x28 NVME type code to scsi fc headers

2016-12-06 10:17:03 +02:00

sound

Merge remote-tracking branches 'asoc/topic/tlv320aic31xx', 'asoc/topic/topology', 'asoc/topic/uda1380', 'asoc/topic/wm2200' and 'asoc/topic/wm8523' into asoc-next

2016-12-12 15:53:25 +00:00

video

…

xen

xen/evtchn: add IOCTL_EVTCHN_RESTRICT

2016-07-25 10:59:31 +01:00

Kbuild

…