Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
authorDavid S. Miller <davem@davemloft.net>
Mon, 9 Jul 2012 23:09:47 +0000 (16:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Jul 2012 23:09:47 +0000 (16:09 -0700)
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>

Trivial merge