Merge branch 'sd8688-move' of git://github.com/lkundrak/linux-firmware

2013-02-18 03:16:26 +00:00 · 2013-02-18 03:16:26 +00:00 · 565c10ba35
parent 27f516c5ec 08967164cd
commit 565c10ba35
5 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -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.
--- a/libertas/sd8688.bin
+++ b/libertas/sd8688.bin
--- a/libertas/sd8688.bin
+++ b/libertas/sd8688.bin
@ -0,0 +1 @@
+../mrvl/sd8688.bin
--- a/libertas/sd8688_helper.bin
+++ b/libertas/sd8688_helper.bin
--- a/libertas/sd8688_helper.bin
+++ b/libertas/sd8688_helper.bin
@ -0,0 +1 @@
+../mrvl/sd8688_helper.bin
--- a/mrvl/sd8688.bin
+++ b/mrvl/sd8688.bin
--- a/mrvl/sd8688_helper.bin
+++ b/mrvl/sd8688_helper.bin