Merge branch 'r8169-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
authorJeff Garzik <jeff@garzik.org>
Tue, 22 Jul 2008 20:07:11 +0000 (16:07 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 22 Jul 2008 20:07:11 +0000 (16:07 -0400)

Trivial merge