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
..
block	DAX error handling for 4.7	2016-05-26 19:34:26 -07:00
char	TTY and Serial driver update for 4.7-rc1	2016-05-20 20:57:27 -07:00
cio	s390: Use pr_warn instead of pr_warning	2016-03-07 13:12:04 +01:00
crypto	s390: make couple of variables and functions static	2016-05-10 13:24:50 +02:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
scsi	zfcp: Revert to original scanning behaviour	2016-04-15 16:53:12 -04:00
virtio	virtio/s390: size of SET_IND payload	2016-03-02 18:08:59 +02:00
Makefile	virtio/s390: rename drivers/s390/kvm -> drivers/s390/virtio	2015-07-07 14:27:06 +03:00