David S. Miller 55b42b5ca2 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>
2014-11-01 14:53:27 -04:00
..
2014-10-26 11:35:51 -07:00
2014-10-08 17:22:23 -04:00
2014-10-14 23:31:13 -07:00
2014-10-14 23:31:13 -07:00
2014-10-11 20:29:01 -04:00