| commit | 810813c47a564416f6306ae214e2661366c987a7 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Mar 08 12:34:12 2016 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Tue Mar 08 12:34:12 2016 -0500 |
| tree | f0d1f856d4b0024324f642fe519963248828b83f | |
| parent | d66ab51442211158b677c2f12310c314d9587f74 [diff] | |
| parent | e2857b8f11a289ed2b61d18d0665e05c1053c446 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Several cases of overlapping changes, as well as one instance (vxlan) of a bug fix in 'net' overlapping with code movement in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>