| commit | d8e4aa070751bfd646b8692cc12b0ee7e55d3266 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Oct 31 08:59:27 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Mon Oct 31 08:59:27 2016 -0400 |
| tree | 1056644953faf55e8b0d75c49f2ce79f958a825b | |
| parent | 0a6ce1e3c1ab71c7b889fae3359c9c3ff3a43aab [diff] |
mv643xx_eth: Fix merge error. One merge conflict block wasn't resolved. Reported-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>