Merge branch 'go7007' of git://linuxtv.org/hverkuil/linux-firmware

[platform/upstream/linux-firmware.git] / WHENCE

diff --git a/WHENCE b/WHENCE
index 03b997a..3864815 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -716,7 +716,7 @@ directly by Marvell.
 
 --------------------------------------------------------------------------
 
-Driver: mwifiex - Marvell Wi-Fi fullmac-type 802.11n card
+Driver: mwifiex - Marvell Wi-Fi fullmac-type 802.11n/ac cards
 
 File: mrvl/sd8787_uapsta.bin
 Version: 14.66.9.p96
@@ -727,6 +727,9 @@ Version: 14.66.11.p151
 File: mrvl/usb8797_uapsta.bin
 Version: 14.69.11.p179
 
+File: mrvl/pcie8897_uapsta.bin
+Version: 15.69.201.p52
+
 Licence: Redistributable. See LICENCE.Marvell for details.  Originates from
 http://git.marvell.com/?p=mwifiex-firmware.git
 
@@ -1494,6 +1497,11 @@ File: radeon/OLAND_mc.bin
 File: radeon/OLAND_me.bin
 File: radeon/OLAND_pfp.bin
 File: radeon/OLAND_rlc.bin
+File: radeon/HAINAN_ce.bin
+File: radeon/HAINAN_mc.bin
+File: radeon/HAINAN_me.bin
+File: radeon/HAINAN_pfp.bin
+File: radeon/HAINAN_rlc.bin
 
 Licence: Redistributable. See LICENSE.radeon for details.
 
@@ -1502,8 +1510,6 @@ Licence: Redistributable. See LICENSE.radeon for details.
 Driver: s2255drv
 
 File: f2255usb.bin
-File: s2250_loader.fw
-File: s2250.fw
 
 Licence:
   Sensoray grants permission to use and redistribute these firmware
@@ -1742,6 +1748,8 @@ File: ti-connectivity/wl18xx-fw.bin
 Version: 8.2.0.0.100
 File: ti-connectivity/wl18xx-fw-2.bin
 Version: 8.5.0.0.55
+File: ti-connectivity/wl18xx-conf.bin
+Version: 6/5
 
 Licence: See LICENCE.ti-connectivity for details.
 
@@ -1871,14 +1879,20 @@ Version: 0.0.1
 File: rtl_nic/rtl8106e-1.fw
 Version: 0.0.1
 
+File: rtl_nic/rtl8106e-2.fw
+Version: 0.0.1
+
 File: rtl_nic/rtl8168g-1.fw
 Version: 0.0.3
 
 File: rtl_nic/rtl8168g-2.fw
 Version: 0.0.1
 
+File: rtl_nic/rtl8168g-3.fw
+Version: 0.0.1
+
 Licence:
- * Copyright © 2011, Realtek Semiconductor Corporation
+ * Copyright © 2011-2013, Realtek Semiconductor Corporation
  *
  * Permission is hereby granted for the distribution of this firmware
  * data in hexadecimal or equivalent format, provided this copyright
@@ -2102,3 +2116,54 @@ File: intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
 Licence: Redistributable. See LICENCE.ibt_firmware for details
 
 --------------------------------------------------------------------------
+
+Driver: btmtk_usb - Bluetooth USB driver
+
+File: mt7650.bin
+
+Licence: Redistributable. See LICENCE.ralink_a_mediatek_company_firmware for details
+
+--------------------------------------------------------------------------
+
+Driver: rp2 -- Comtrol RocketPort 2 serial driver
+
+File: rp2.fw
+
+Licence:
+Copyright (C) 2013 Comtrol Corporation
+
+Comtrol grants permission to use and redistribute these firmware
+files for use with Comtrol devices, but not as part of the Linux
+kernel or in any other form which would require these files themselves
+to be covered by the terms of the GNU General Public License.
+
+These firmware files are distributed in the hope that they will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+--------------------------------------------------------------------------
+
+Driver: go7007
+
+File: go7007/s2250-1.fw
+File: go7007/s2250-2.fw
+
+Licence:
+  Sensoray grants permission to use and redistribute these firmware
+  files for use with Sensoray devices, but not as a part of the Linux
+  kernel or in any other form which would require these files themselves
+  to be covered by the terms of the GNU General Public License.
+  These firmware files are distributed in the hope that they will be
+  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+File: go7007/go7007fw.bin
+File: go7007/go7007tv.bin
+File: go7007/lr192.fw
+File: go7007/px-m402u.fw
+File: go7007/px-tv402u.fw
+File: go7007/wis-startrek.fw
+
+Licence: Redistributable. See LICENCE.go7007_firmware for details
+
+--------------------------------------------------------------------------