Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Sep 2011 17:46:03 +0000 (13:46 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Sep 2011 17:46:03 +0000 (13:46 -0400)

Trivial merge