aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2013-09-30 04:50:51 +0100
committerBen Hutchings <ben@decadent.org.uk>2013-09-30 04:50:51 +0100
commit8ff6cc3a5e1d9452ae8fb993532afc1f3ab3a71f (patch)
tree86d60900e048f94f9e1fde98e62867d01358b39d
parent1461bed1300097efeba59c82ffa30c90cc7e3ae5 (diff)
parente7c85b24a5e5107e9911c6b80f536b6bbc5d465d (diff)
downloadlinux-firmware-8ff6cc3a5e1d9452ae8fb993532afc1f3ab3a71f.tar.gz
Merge branch 'moxa' of https://github.com/lunn/linux-firmware
-rw-r--r--WHENCE18
-rw-r--r--moxa/moxa-1250.fw (renamed from moxa/moxa-04e2.fw)bin33681 -> 33681 bytes
-rw-r--r--moxa/moxa-1251.fw (renamed from moxa/moxa-04e3.fw)bin33685 -> 33685 bytes
-rw-r--r--moxa/moxa-1410.fw (renamed from moxa/moxa-0582.fw)bin33521 -> 33521 bytes
-rw-r--r--moxa/moxa-1450.fw (renamed from moxa/moxa-05aa.fw)bin33521 -> 33521 bytes
-rw-r--r--moxa/moxa-1451.fw (renamed from moxa/moxa-05ab.fw)bin33525 -> 33525 bytes
-rw-r--r--moxa/moxa-1613.fw (renamed from moxa/moxa-064d.fw)bin33529 -> 33529 bytes
-rw-r--r--moxa/moxa-1618.fw (renamed from moxa/moxa-0652.fw)bin33525 -> 33525 bytes
-rw-r--r--moxa/moxa-1653.fw (renamed from moxa/moxa-0675.fw)bin33529 -> 33529 bytes
-rw-r--r--moxa/moxa-1658.fw (renamed from moxa/moxa-067a.fw)bin33525 -> 33525 bytes
10 files changed, 9 insertions, 9 deletions
diff --git a/WHENCE b/WHENCE
index 40a92d7d..9a4b9d5d 100644
--- a/WHENCE
+++ b/WHENCE
@@ -2236,15 +2236,15 @@ License: Redistributable. See LICENSE.amd-ucode for details
Driver: mxuport - MOXA UPort USB Serial hub driver
-File: moxa/moxa-04e2.fw
-File: moxa/moxa-04e3.fw
-File: moxa/moxa-0582.fw
-File: moxa/moxa-05aa.fw
-File: moxa/moxa-05ab.fw
-File: moxa/moxa-064d.fw
-File: moxa/moxa-0652.fw
-File: moxa/moxa-0675.fw
-File: moxa/moxa-067a.fw
+File: moxa/moxa-1250.fw
+File: moxa/moxa-1251.fw
+File: moxa/moxa-1410.fw
+File: moxa/moxa-1450.fw
+File: moxa/moxa-1451.fw
+File: moxa/moxa-1613.fw
+File: moxa/moxa-1618.fw
+File: moxa/moxa-1653.fw
+File: moxa/moxa-1658.fw
License:
The software accompanying this license statement (the “Software”)
diff --git a/moxa/moxa-04e2.fw b/moxa/moxa-1250.fw
index 61e7ea5a..61e7ea5a 100644
--- a/moxa/moxa-04e2.fw
+++ b/moxa/moxa-1250.fw
Binary files differ
diff --git a/moxa/moxa-04e3.fw b/moxa/moxa-1251.fw
index 7f406506..7f406506 100644
--- a/moxa/moxa-04e3.fw
+++ b/moxa/moxa-1251.fw
Binary files differ
diff --git a/moxa/moxa-0582.fw b/moxa/moxa-1410.fw
index e370bef5..e370bef5 100644
--- a/moxa/moxa-0582.fw
+++ b/moxa/moxa-1410.fw
Binary files differ
diff --git a/moxa/moxa-05aa.fw b/moxa/moxa-1450.fw
index 9ba83748..9ba83748 100644
--- a/moxa/moxa-05aa.fw
+++ b/moxa/moxa-1450.fw
Binary files differ
diff --git a/moxa/moxa-05ab.fw b/moxa/moxa-1451.fw
index 79164d3d..79164d3d 100644
--- a/moxa/moxa-05ab.fw
+++ b/moxa/moxa-1451.fw
Binary files differ
diff --git a/moxa/moxa-064d.fw b/moxa/moxa-1613.fw
index 84662692..84662692 100644
--- a/moxa/moxa-064d.fw
+++ b/moxa/moxa-1613.fw
Binary files differ
diff --git a/moxa/moxa-0652.fw b/moxa/moxa-1618.fw
index 89eda87c..89eda87c 100644
--- a/moxa/moxa-0652.fw
+++ b/moxa/moxa-1618.fw
Binary files differ
diff --git a/moxa/moxa-0675.fw b/moxa/moxa-1653.fw
index e6196896..e6196896 100644
--- a/moxa/moxa-0675.fw
+++ b/moxa/moxa-1653.fw
Binary files differ
diff --git a/moxa/moxa-067a.fw b/moxa/moxa-1658.fw
index 57cfb48a..57cfb48a 100644
--- a/moxa/moxa-067a.fw
+++ b/moxa/moxa-1658.fw
Binary files differ