David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-15 21:16:30 -04:00
..
core	netlink: pass extended ACK struct to parsing functions	2017-04-13 13:58:22 -04:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-06 08:24:51 -07:00
sw	IB/rxe: increment msn only when completing a request	2017-03-24 22:07:27 -04:00
ulp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2017-04-11 23:51:58 -07:00
Kconfig	RDMA/bnxt_re: Add bnxt_re driver build support	2017-02-14 09:51:28 -05:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00