summaryrefslogtreecommitdiff
path: root/net/can
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-07-09 16:09:47 -0700
committerDavid S. Miller <davem@davemloft.net>2012-07-09 16:09:47 -0700
commit061a5c316b6526dbc729049a16243ec27937cc31 (patch)
treea11e64e6a93363986c240a2e26be4bcfe5bc59da /net/can
parent59399c59262bbb8ae60a37935c3a512d2e79cca3 (diff)
parentc558386b836ee97762e12495101c6e373f20e69d (diff)
Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
Francois Romieu (4): r8169: mdio_ops signature change. r8169: csi_ops signature change. r8169: ephy, eri and efuse functions signature changes. r8169: abstract out loop conditions. Hayes Wang (2): r8169: add RTL8106E support. r8169: support RTL8168G Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions