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)
commitd999597349dcfd3b11205705c31a2f8e00688dd3
treeedc4414ea3f7f15b98472e45d4442b5670c380f5
parentb32d13102d39ed411d152a7ffcc5f66d5b3b1b49
parent77332894c21165404496c56763d7df6c15c4bb09
Merge branch 'r8169-davem' of git://git./linux/kernel/git/romieu/netdev-2.6 into upstream-fixes