Skip to content

Commit

Permalink
Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
David S. Miller committed Jul 9, 2012
2 parents 59399c5 + c558386 commit 061a5c3
Showing 1 changed file with 666 additions and 318 deletions.
Loading

0 comments on commit 061a5c3

Please sign in to comment.