David S. Miller 27058af401 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Mostly simple overlapping changes.

For example, David Ahern's adjacency list revamp in 'net-next'
conflicted with an adjacency list traversal bug fix in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-10-30 12:42:58 -04:00

28 KiB

Raw Blame History

View Raw