Merge branch 'r6040' of...

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

Merge branch 'r6040' of...
Merge branch 'r6040' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into upstream-fixes
6585b4a7 · Jeff Garzik · 179c743f · ec6d2d45 · 6585b4a7
Commit 6585b4a7 authored Feb 11, 2008 by Jeff Garzik
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 135 additions and 98 deletions

drivers/net/r6040.c drivers/net/r6040.c +135 -98

No files found.
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c