David S. Miller c0cc53162a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes in the conflicts. In the macsec case, the change of the default ID macro name overlapped with the 64-bit netlink attribute alignment fixes in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-27 15:43:10 -04:00
..
asm-generic	generic syscalls: wire up preadv2 and pwritev2 syscalls	2016-04-23 22:38:08 +02:00
drm	Merge tag 'topic/drm-misc-2016-03-14' of git://anongit.freedesktop.org/drm-intel into drm-next	2016-03-16 11:09:26 +10:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-27 15:43:10 -04:00
misc	cxl: Support to flash a new image on the adapter from a guest	2016-03-09 23:39:56 +11:00
mtd
rdma	Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6	2016-03-21 17:32:23 -04:00
scsi
sound	ALSA: seq: Provide card number / PID via sequencer client info	2016-03-08 10:52:52 +01:00
video
xen
Kbuild