| commit | 55b42b5ca2dcf143465968697fe6c6503b05fca1 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Nov 01 14:53:27 2014 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sat Nov 01 14:53:27 2014 -0400 |
| tree | 91878cd53efc44ba67244d4d3897020828c87c01 | |
| parent | 10738eeaf4ab3de092586cefcc082e7d43ca0044 [diff] | |
| parent | ec1f1276022e4e3ca40871810217d513e39ff250 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/phy/marvell.c Simple overlapping changes in drivers/net/phy/marvell.c Signed-off-by: David S. Miller <davem@davemloft.net>