Merge branch 'ixgbe'
authorDavid S. Miller <davem@davemloft.net>
Sat, 18 Jan 2014 02:57:35 +0000 (18:57 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 18 Jan 2014 02:57:35 +0000 (18:57 -0800)
commitd7c35c388ae9089af4edcef91b1aeed14daa4693
tree473173a535a15e0c5fded6858c91deb442b5d5b3
parent0113e34bec17578516eaa457b4a0ea255b0c1276
parent86f359f6b8a303d4cc99e889a3481d88cae1bec2
Merge branch 'ixgbe'

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>