David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
asm-generic	New getsockopt option to get socket cookie	2017-04-08 08:07:01 -07:00
drm	uapi: fix drm/omap_drm.h userspace compilation errors	2017-03-13 12:53:27 +02:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
misc	cxl: Use fixed width predefined types in data structure.	2016-08-09 16:52:01 +10:00
mtd	…
rdma	uapi: fix rdma/mlx5-abi.h userspace compilation errors	2017-03-24 22:01:35 -04:00
scsi	scsi: cxlflash: Support SQ Command Mode	2017-01-11 22:38:15 -05: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/privcmd: add IOCTL_PRIVCMD_RESTRICT	2017-02-14 15:14:59 -05:00
Kbuild	…