Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Jul 2012 16:10:26 +0000 (09:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jul 2012 16:10:26 +0000 (09:10 -0700)
commit1c652966d9215d7c9fac7394bb7014213bffabb7
treeeeec11ba048b172f7d1e34bde69b4f645a65990e
parent54399a78c95f1be0ae9bf6587cbddbfc641aab9c
parent82e316efbd1c68946c8760f930b81d73e9c4425a
Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux

Francois Romieu says:

====================
Francois Romieu (1):
      r8169: verbose error message.

Hayes Wang (1):
      r8169: remove rtl_ocpdr_cond.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>