Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next

Browse source

...

This commit is contained in:

David S. Miller 2012-02-23 14:30:46 -05:00

parent 21f7638e6f 73e0026fb2

commit 32d219ed61

7 changed files with 24 additions and 14 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

4

drivers/net/ethernet/sfc/bitfield.h

View file

7

drivers/net/ethernet/sfc/efx.c

View file

2

drivers/net/ethernet/sfc/mcdi_mon.c

View file

9

drivers/net/ethernet/sfc/net_driver.h

View file

11

drivers/net/ethernet/sfc/siena_sriov.c

View file

2

drivers/net/ethernet/sfc/tx.c

View file

3

drivers/net/ethernet/sfc/vfdi.h

View file