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-12-02 22:00:34 -08:00

parent 3248e16820 1f5865e73f

commit e00484023e

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

36

drivers/net/atl1e/atl1e_main.c

View file

1

drivers/net/bnx2.c

View file