Merge branch 'sfc-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6

Browse source

...

This commit is contained in:

David S. Miller 2011-04-12 17:10:52 -07:00

parent bfac3693c4 fcfa060468

commit c0212fb146

7 changed files with 30 additions and 31 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

6

drivers/net/sfc/efx.c

View file

2

drivers/net/sfc/io.h

View file

2

drivers/net/sfc/net_driver.h

View file

22

drivers/net/sfc/nic.c

View file

1

drivers/net/sfc/nic.h

View file

25

drivers/net/sfc/selftest.c

View file

3

drivers/net/sfc/tx.c

View file