Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Jul 2012 08:28:36 +0000 (01:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Jul 2012 08:28:36 +0000 (01:28 -0700)

Trivial merge