| commit | 27058af401e49d88a905df000dd26f443fcfa8ce | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Oct 30 12:42:58 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sun Oct 30 12:42:58 2016 -0400 |
| tree | 819f32113d3b8374b9fbf72e2202d4c4d4511a60 | |
| parent | 357f4aae859b5d74554b0ccbb18556f1df4166c3 [diff] | |
| parent | 2a26d99b251b8625d27aed14e97fc10707a3a81f [diff] |
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>