Merge branch 'davem.r8169.fixes' of git://violet.fr.zoreil.com/romieu/linux
authorDavid S. Miller <davem@davemloft.net>
Tue, 20 Sep 2011 18:42:45 +0000 (14:42 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Sep 2011 18:42:45 +0000 (14:42 -0400)

Trivial merge