| commit | 6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Apr 17 11:26:25 2019 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Apr 17 11:26:25 2019 -0700 |
| tree | 0a7976054052e793da782c2b7ec34eccfbf66449 | |
| parent | cea0aa9cbd5ad4efe267e9487ed5d48d16756253 [diff] | |
| parent | fe5cdef29e41c8bda8cd1a11545e7c6bfe25570e [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>