From: David S. Miller <davem@davemloft.net>
Date: Thu, 13 Feb 2014 22:27:33 +0000 (-0500)
Subject: Merge branch 'i40e'
X-Git-Tag: v3.15-rc1~113^2~370
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0e42aa4fb0b6a2dc1aadbfca7a0457ee484fe6f9;p=linux.git

Merge branch 'i40e'

Aaron Brown says:

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

This series contains updates to i40e and i40evf, primarily reset
handling / refactoring along with a fair amount of minor cleanup.

Jesse fixes some spelling, bumps the version and other trivial fixes.
Akeem sets a bit that is needed before shutdown in the case of
tx_timeout recovery failure.  Mitch refactors reset handling along
with a whole bunch of clean up.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

0e42aa4fb0b6a2dc1aadbfca7a0457ee484fe6f9