diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-07-09 16:09:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-09 16:09:47 -0700 |
| commit | 061a5c316b6526dbc729049a16243ec27937cc31 (patch) | |
| tree | a11e64e6a93363986c240a2e26be4bcfe5bc59da /net/can | |
| parent | net/fsl_pq_mdio: use spin_event_timeout() to poll the indicator register (diff) | |
| parent | r8169: support RTL8168G (diff) | |
| download | linux-dev-061a5c316b6526dbc729049a16243ec27937cc31.tar.xz linux-dev-061a5c316b6526dbc729049a16243ec27937cc31.zip | |
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