From: David S. Miller Date: Sat, 18 Jan 2014 02:57:35 +0000 (-0800) Subject: Merge branch 'ixgbe' X-Git-Tag: firefly_0821_release~176^2~4570^2~101 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d7c35c388ae9089af4edcef91b1aeed14daa4693;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: David S. Miller --- d7c35c388ae9089af4edcef91b1aeed14daa4693