Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git

Browse source

...

This commit is contained in:

Linus Torvalds 2005-05-16 20:06:47 -07:00

parent 8711a1b902 c8920ba041

commit d3f0fcec2d

4 changed files with 4 additions and 4 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/Makefile

View file

2

drivers/net/ibm_emac/ibm_emac_core.c

View file

2

drivers/net/tulip/tulip_core.c

View file

2

drivers/net/wireless/Kconfig

View file