summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-08-17 20:16:00 -0700
committerDavid S. Miller <davem@davemloft.net>2011-08-17 20:16:00 -0700
commitf3ba150392c85d8175c454a7190b5fa46a49039e (patch)
tree4df54351d5d71fddaf416c3ee984382e885c7acb /drivers/net/ethernet/marvell
parentc6865cb3cc6f3c2857fa4c6f5fda2945d70b1e84 (diff)
parent665d7eb8877c6bb777039efb22f894740be10bcb (diff)
downloadblackbird-op-linux-f3ba150392c85d8175c454a7190b5fa46a49039e.tar.gz
blackbird-op-linux-f3ba150392c85d8175c454a7190b5fa46a49039e.zip
Merge branch 'can/mscan' of git://git.pengutronix.de/git/mkl/linux-2.6
Diffstat (limited to 'drivers/net/ethernet/marvell')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud