Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Jun 2011 21:33:01 +0000 (14:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Jun 2011 21:33:01 +0000 (14:33 -0700)

Trivial merge