Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware

Conflicts:
	WHENCE

WHENCE

@@ -1192,3 +1192,19 @@ File: radeon/R700_rlc.bin
 Licence: Redistributable. See LICENSE.radeon_rlc for details.
 
 --------------------------------------------------------------------------
+
+Driver: s2255drv
+
+File: f2255usb.bin
+File: s2250_loader.fw
+File: s2250.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.
+