Merge branch 'r8169-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
authorDavid S. Miller <davem@davemloft.net>
Wed, 23 Feb 2011 23:03:11 +0000 (15:03 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Feb 2011 23:03:11 +0000 (15:03 -0800)

Trivial merge