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

Browse source

...

This commit is contained in:

David S. Miller 2009-05-03 14:18:53 -07:00

parent d252a5e7b7 379b026ecc

commit 698960a081

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

7

drivers/net/ne2k-pci.c

View file

1

net/atm/br2684.c

View file

2

net/sched/cls_api.c

View file