Merge branch 'ixgbe'

Browse source

Aaron Brown says:

====================
Intel Wired LAN Driver Updates

This series contains an updates to ixgbe and ixgbevf.

Jacob add braces around some ixgbe_qv_lock_* calls lto better adhere
to Kernel style guidelines.  Don bumps the versions on ixgbe and
ixgbevf to match internal driver functionality better.
====================

Reviewed-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2014-01-17 18:57:35 -08:00

parent 0113e34bec 86f359f6b8

commit d7c35c388a

3 changed files with 6 additions and 4 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/ethernet/intel/ixgbe/ixgbe.h

View file

2

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

View file

2

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

View file