Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

...

This commit is contained in:

Linus Torvalds 2005-09-29 08:56:47 -07:00

parent 6dec3cf5cd 01d40f28b1

commit eb693d2994

20 changed files with 9954 additions and 152 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

include/linux/if_ether.h

View file

89

include/linux/netdevice.h

View file

2

include/linux/pci_ids.h

View file