]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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>

Trivial merge