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

Browse source

...

This commit is contained in:

Jeff Garzik 2007-10-29 05:48:33 -04:00

parent 3830de7300 d1417862d7

commit af0900537f

2 changed files with 13 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

drivers/net/Kconfig

View file

12

drivers/net/r8169.c

View file