aboutsummaryrefslogtreecommitdiff
path: root/net/decnet/dn_fib.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-03-22 10:25:25 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-22 10:25:25 -0400
commit9b924dbd5e903aa6394ff6feee8275b9bde313d1 (patch)
treee61bf96df027d188c5b07722911121ec1186e701 /net/decnet/dn_fib.c
parent43d6869037d6fa8f92a7a7e6df3b48147c8a3ef9 (diff)
parentc3a07134e6aa5b93a37f72ffa3d11fadf72bf757 (diff)
downloadlinux-stericsson-9b924dbd5e903aa6394ff6feee8275b9bde313d1.tar.gz
Merge branch 'mv643xx_eth'
Florian Fainelli says: ==================== This patch converts the mv643xx_eth driver to use the mvmdio MDIO bus driver instead of rolling its own implementation. As a result, all users of this mv643xx_eth driver are converted to register an "orion-mdio" platform_device. The mvmdio driver is also updated to support an interrupt line which reports SMI error/completion, and to allow traditionnal platform device registration instead of just device tree. David, I think it makes sense for you to merge all of this, since we do not want the architecture files to be desynchronized from the mv643xx_eth to avoid runtime breakage. The potential for merge conflicts should be very small. ==================== Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/dn_fib.c')
0 files changed, 0 insertions, 0 deletions