David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

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

2016-07-06 10:35:22 -07:00

..

asm-generic

asm-generic: Drop renameat syscall from default list

2016-05-05 00:42:21 +02:00

drm

drm/vmwgfx: add extern C guard for the UAPI header

2016-05-13 14:06:21 +01:00

linux

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

2016-07-06 10:35:22 -07:00

misc

cxl: Support to flash a new image on the adapter from a guest

2016-03-09 23:39:56 +11:00

mtd

mtd: kill the nand_ecclayout struct

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

rdma

Merge branch 'hfi1-2' into k.o/for-4.7

2016-05-26 12:50:05 -04:00

scsi

cxlflash: Fix to avoid virtual LUN failover failure

2016-01-06 20:50:08 -05:00

sound

ALSA: uapi: Add three missing header files to Kbuild file

2016-05-31 17:33:32 +02:00

video

…

xen

xen/gntdev: add ioctl for grant copy

2016-01-07 13:21:53 +00:00

Kbuild

…