Merge commit '60db383a' of https://github.com/dchickles-cavm/linux-firmware

56d49f81 · Kyle McMartin · 14c2d0be · 60db383a · 56d49f81 · 56d49f81
Commit 56d49f81 authored Feb 17, 2017 by Kyle McMartin
--- a/WHENCE
+++ b/WHENCE
@@ -3196,14 +3196,17 @@ Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k and qca/NOTICE.txt

 Driver: liquidio -- Cavium LiquidIO driver

+File: liquidio/lio_23xx_nic.bin
+Version: v1.4.2
+
 File: liquidio/lio_210nv_nic.bin
-Version: v1.1.9
+Version: v1.4.2

 File: liquidio/lio_210sv_nic.bin
-Version: v1.1.9
+Version: v1.4.2

 File: liquidio/lio_410nv_nic.bin
-Version: v1.1.9
+Version: v1.4.2

 Licence: Redistributable. See LICENCE.cavium for details


--- a/liquidio/lio_210nv_nic.bin
+++ b/liquidio/lio_210nv_nic.bin
--- a/liquidio/lio_210sv_nic.bin
+++ b/liquidio/lio_210sv_nic.bin
--- a/liquidio/lio_23xx_nic.bin
+++ b/liquidio/lio_23xx_nic.bin
--- a/liquidio/lio_410nv_nic.bin
+++ b/liquidio/lio_410nv_nic.bin