David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

2017-06-15 11:59:32 -04:00

..

asm-generic

net: add new control message for incoming HW-timestamped packets

2017-05-21 13:37:32 -04:00

drm

Merge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux into drm-next

2017-05-12 13:58:29 +10:00

linux

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

2017-06-15 11:59:32 -04:00

misc

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

mtd

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

rdma

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

scsi

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

sound

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

video

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

xen

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00