Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
authorDavid S. Miller <davem@davemloft.net>
Sun, 19 Jun 2011 23:26:46 +0000 (16:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 19 Jun 2011 23:26:46 +0000 (16:26 -0700)

Trivial merge