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-02-04 16:52:41 -08:00

parent 005c79b3d4 b98ac702f4

commit 7870389478

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

3

drivers/net/cxgb3/sge.c

View file

3

drivers/net/gianfar.c

View file

2

drivers/net/gianfar.h

View file