Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse source

...

This commit is contained in:

David S. Miller 2008-02-15 15:59:19 -08:00

parent 42fe95cae5 e8ef7f295b

commit b57dfbc4f7

12 changed files with 114 additions and 100 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

2

drivers/net/e1000/e1000_ethtool.c

View file

8

drivers/net/e1000/e1000_main.c

View file

34

drivers/net/e1000e/netdev.c

View file

4

drivers/net/gianfar.c

View file

4

drivers/net/gianfar_mii.c

View file

5

drivers/net/hamradio/mkiss.c

View file

2

drivers/net/igb/igb_ethtool.c

View file

28

drivers/net/igb/igb_main.c

View file

2

drivers/net/ixgb/ixgb_ethtool.c

View file

41

drivers/net/ixgbe/ixgbe_main.c

View file

12

drivers/net/pcmcia/smc91c92_cs.c

View file

76

drivers/net/tsi108_eth.c

View file