aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2013-02-18 03:16:26 +0000
committerBen Hutchings <ben@decadent.org.uk>2013-02-18 03:16:26 +0000
commit565c10ba357a6c088b08a59bfecc8776271fb2bc (patch)
tree3d4f342f69e05c43e21d50cadc55123b87354460
parent27f516c5ec76ec2d08d64a3f5f9538244a52cd11 (diff)
parent08967164cd17cc67227a51e68a944ca0f3b14846 (diff)
downloadlinux-firmware-565c10ba357a6c088b08a59bfecc8776271fb2bc.tar.gz
Merge branch 'sd8688-move' of git://github.com/lkundrak/linux-firmware
-rw-r--r--WHENCE4
l---------[-rw-r--r--]libertas/sd8688.binbin259172 -> 18 bytes
l---------[-rw-r--r--]libertas/sd8688_helper.binbin2616 -> 25 bytes
-rw-r--r--mrvl/sd8688.binbin0 -> 259172 bytes
-rw-r--r--mrvl/sd8688_helper.binbin0 -> 2616 bytes
5 files changed, 2 insertions, 2 deletions
diff --git a/WHENCE b/WHENCE
index 96bf4b81..287b122c 100644
--- a/WHENCE
+++ b/WHENCE
@@ -667,11 +667,11 @@ File: libertas/sd8686_v8.bin
File: libertas/sd8686_v8_helper.bin
File: libertas/sd8686_v9.bin
File: libertas/sd8686_v9_helper.bin
-File: libertas/sd8688.bin
-File: libertas/sd8688_helper.bin
File: libertas/usb8388_v5.bin
File: libertas/usb8388_v9.bin
File: libertas/usb8682.bin
+File: mrvl/sd8688.bin
+File: mrvl/sd8688_helper.bin
Licence: Redistributable. See LICENCE.Marvell for details. Extracted from
Linux driver tarballs downloaded from Marvell's "Extranet" with permission.
diff --git a/libertas/sd8688.bin b/libertas/sd8688.bin
index 199e32ad..46d817f5 100644..120000
--- a/libertas/sd8688.bin
+++ b/libertas/sd8688.bin
Binary files differ
diff --git a/libertas/sd8688_helper.bin b/libertas/sd8688_helper.bin
index 746ae0bf..6515a2c5 100644..120000
--- a/libertas/sd8688_helper.bin
+++ b/libertas/sd8688_helper.bin
Binary files differ
diff --git a/mrvl/sd8688.bin b/mrvl/sd8688.bin
new file mode 100644
index 00000000..199e32ad
--- /dev/null
+++ b/mrvl/sd8688.bin
Binary files differ
diff --git a/mrvl/sd8688_helper.bin b/mrvl/sd8688_helper.bin
new file mode 100644
index 00000000..746ae0bf
--- /dev/null
+++ b/mrvl/sd8688_helper.bin
Binary files differ