9da
parent 59399c59262bbb8ae60a37935c3a512d2e79cca3
parent c558386b836ee97762e12495101c6e373f20e69d
author David S. Miller <davem@davemloft.net> 1341875387 -0700
committer David S. Miller <davem@davemloft.net> 1341875387 -0700

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>
i��H�)x