Merge commit 'b39260f0' of...

Merge commit 'b39260f0' of https://github.com/Netronome/linux-firmware

Merge commit 'b39260f0' of...
Merge commit 'b39260f0' of https://github.com/Netronome/linux-firmware
bc2164d5 · Kyle McMartin · fdee922a · b39260f0 · bc2164d5 · fdee922a
Commit bc2164d5 authored Dec 06, 2017 by Kyle McMartin
--- a/netronome/nic/nic_AMDA0099-0001_2x25.nffw
+++ b/netronome/nic/nic_AMDA0099-0001_2x25.nffw
--- a/netronome/nic_AMDA0081-0001_1x40.nffw
+++ b/netronome/nic_AMDA0081-0001_1x40.nffw
--- a/netronome/nic_AMDA0081-0001_1x40.nffw
+++ b/netronome/nic_AMDA0081-0001_1x40.nffw
+nic/nic_AMDA0081-0001_1x40.nffw
\ No newline at end of file
--- a/netronome/nic_AMDA0081-0001_4x10.nffw
+++ b/netronome/nic_AMDA0081-0001_4x10.nffw
--- a/netronome/nic_AMDA0081-0001_4x10.nffw
+++ b/netronome/nic_AMDA0081-0001_4x10.nffw
+nic/nic_AMDA0081-0001_4x10.nffw
\ No newline at end of file
--- a/netronome/nic_AMDA0096-0001_2x10.nffw
+++ b/netronome/nic_AMDA0096-0001_2x10.nffw
--- a/netronome/nic_AMDA0096-0001_2x10.nffw
+++ b/netronome/nic_AMDA0096-0001_2x10.nffw
+nic/nic_AMDA0096-0001_2x10.nffw
\ No newline at end of file
--- a/netronome/nic_AMDA0097-0001_2x40.nffw
+++ b/netronome/nic_AMDA0097-0001_2x40.nffw
--- a/netronome/nic_AMDA0097-0001_2x40.nffw
+++ b/netronome/nic_AMDA0097-0001_2x40.nffw
+nic/nic_AMDA0097-0001_2x40.nffw
\ No newline at end of file
--- a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
+++ b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
--- a/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
+++ b/netronome/nic_AMDA0097-0001_4x10_1x40.nffw
+nic/nic_AMDA0097-0001_4x10_1x40.nffw
\ No newline at end of file
--- a/netronome/nic_AMDA0097-0001_8x10.nffw
+++ b/netronome/nic_AMDA0097-0001_8x10.nffw
--- a/netronome/nic_AMDA0097-0001_8x10.nffw
+++ b/netronome/nic_AMDA0097-0001_8x10.nffw
+nic/nic_AMDA0097-0001_8x10.nffw
\ No newline at end of file
--- a/netronome/nic_AMDA0099-0001_2x10.nffw
+++ b/netronome/nic_AMDA0099-0001_2x10.nffw
--- a/netronome/nic_AMDA0099-0001_2x10.nffw
+++ b/netronome/nic_AMDA0099-0001_2x10.nffw
+nic/nic_AMDA0099-0001_2x10.nffw
\ No newline at end of file
--- a/netronome/nic_AMDA0099-0001_2x25.nffw
+++ b/netronome/nic_AMDA0099-0001_2x25.nffw
--- a/netronome/nic_AMDA0099-0001_2x25.nffw
+++ b/netronome/nic_AMDA0099-0001_2x25.nffw
+nic/nic_AMDA0099-0001_2x25.nffw
\ No newline at end of file