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

Conflicts:
	WHENCE

diff --cc WHENCE
index 5e502b875629db891ebf6dd22631fd8d2a093ccc,19f75589ed2f5347152703805c1e571706ab1e4c..e38d34efeace8b5a281a026d44d6cbc59bbb6973
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -1184,11 -1173,17 +1184,27 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 -File: f2255.bin
 +Driver: radeon - ATI Radeon
 +
 +File: radeon/R600_rlc.bin
 +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.
++