From: David S. Miller <davem@davemloft.net>
Date: Wed, 18 Jul 2012 16:10:26 +0000 (-0700)
Subject: Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
X-Git-Tag: upstream/snapshot3+hdmi~6997^2~119
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c652966d9215d7c9fac7394bb7014213bffabb7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

1c652966d9215d7c9fac7394bb7014213bffabb7