Merge branch 'r8169-next' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-next

This commit is contained in:
Jeff Garzik 2008-07-04 08:35:57 -04:00 committed by Jeff Garzik
commit 16e605a2a0
2 changed files with 45 additions and 116 deletions