| commit | 4e8f2fc1a55d543717efb70e170b09e773d0542b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Jan 28 10:33:06 2017 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Sat Jan 28 10:33:06 2017 -0500 |
| tree | 30df1d7fc9dfa24fe2916711a17656682c3f7ec9 | |
| parent | 158f323b9868b59967ad96957c4ca388161be321 [diff] | |
| parent | 1b1bc42c1692e9b62756323c675a44cb1a1f9dbd [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <davem@davemloft.net>