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
..
asm	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2017-04-06 13:16:34 -07:00
uapi/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-15 21:16:30 -04:00