Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...
authorJeff Garzik <jeff@garzik.org>
Sat, 23 Sep 2006 00:18:02 +0000 (20:18 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 23 Sep 2006 00:18:02 +0000 (20:18 -0400)
commit78cc3b78c4208d28e7f4ecded82e238224ed4d1c
tree137f4fe32e41572bb41ba170f6b822ebf215079e
parentff2a2e0172fd11b1bfb9b45ee1b996d3f10669af
parentd81bf551103cc3bc9e4f7ddf337511d6da0d088f
Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp
drivers/net/r8169.c