Merge branch 'r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Oct 2008 21:43:54 +0000 (14:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Oct 2008 21:43:54 +0000 (14:43 -0700)

Trivial merge