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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-08-12 09:22:34 -07:00

parent 349188f66d d7b9dfc8ea

commit 63788ea924

5 changed files with 59 additions and 36 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

1

drivers/net/e1000/e1000_main.c

View file

20

include/linux/netpoll.h

View file

2

include/linux/skbuff.h

View file

9

net/core/dev.c

View file

63

net/core/netpoll.c

View file