David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-09 15:59:24 -04:00
..
core	IB/security: Restrict use of the write() interface	2016-04-28 12:03:16 -04:00
hw	Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue	2016-05-06 15:55:30 -04:00
sw	IB/rdmavt: Fix send scheduling	2016-04-28 12:00:39 -04:00
ulp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
Kconfig	Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6	2016-03-21 17:32:23 -04:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00