| commit | 1c652966d9215d7c9fac7394bb7014213bffabb7 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Jul 18 09:10:26 2012 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Jul 18 09:10:26 2012 -0700 |
| tree | eeec11ba048b172f7d1e34bde69b4f645a65990e | |
| parent | 54399a78c95f1be0ae9bf6587cbddbfc641aab9c [diff] | |
| parent | 82e316efbd1c68946c8760f930b81d73e9c4425a [diff] |
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>