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

diff --git a/WHENCE b/WHENCE
index 8a7e041b11741e6b1bea64ba38ac545b3eed8a77..20c1b7e8804139662215b992670b2692c80e3c4e 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -538,7 +538,7 @@ Also available from http://intellinuxwireless.org/?n=Downloads
 
 --------------------------------------------------------------------------
 
-Driver: cx231xx -  Conexant Cx23100/101/102 USB video capture devices
+Driver: cx231xx - Conexant Cx23100/101/102 USB broadcast A/V decoder
 
 File: v4l-cx231xx-avcore-01.fw
 
@@ -660,3 +660,51 @@ Licence: Allegedly GPL, but no source visible. Marked:
 Found in hex form in kernel source.
 
 --------------------------------------------------------------------------
+
+Driver: cx23418 - Conexant PCI Broadcast A/V with MPEG encoder
+
+File: v4l-cx23418-apu.fw
+File: v4l-cx23418-cpu.fw
+File: v4l-cx23418-dig.fw
+
+License:
+  Conexant grants permission to use and redistribute these firmware
+  files for use with Conexant 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.
+
+--------------------------------------------------------------------------
+
+Driver: cx23885 - Conexant PCI Express Broadcast A/V decoder
+
+File: v4l-cx23885-avcore-01.fw
+File: v4l-cx23885-enc.fw
+
+License:
+  Conexant grants permission to use and redistribute these firmware
+  files for use with Conexant 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.
+
+--------------------------------------------------------------------------
+
+Driver: cx23840 - Conexant sideport Broadcast A/V decoder
+
+File: v4l-cx25840.fw
+
+License:
+  Conexant grants permission to use and redistribute these firmware
+  files for use with Conexant 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.
+
+--------------------------------------------------------------------------

diff --git a/v4l-cx23418-apu.fw b/v4l-cx23418-apu.fw
new file mode 100644 (file)
index 0000000..04351f1
Binary files /dev/null and b/v4l-cx23418-apu.fw differ

diff --git a/v4l-cx23418-cpu.fw b/v4l-cx23418-cpu.fw
new file mode 100644 (file)
index 0000000..22227b6
Binary files /dev/null and b/v4l-cx23418-cpu.fw differ

diff --git a/v4l-cx23418-dig.fw b/v4l-cx23418-dig.fw
new file mode 100644 (file)
index 0000000..cfd6e84
Binary files /dev/null and b/v4l-cx23418-dig.fw differ

diff --git a/v4l-cx23885-avcore-01.fw b/v4l-cx23885-avcore-01.fw
new file mode 100644 (file)
index 0000000..5efd51c
Binary files /dev/null and b/v4l-cx23885-avcore-01.fw differ

diff --git a/v4l-cx23885-enc.fw b/v4l-cx23885-enc.fw
new file mode 100644 (file)
index 0000000..5efd51c
Binary files /dev/null and b/v4l-cx23885-enc.fw differ

diff --git a/v4l-cx25840.fw b/v4l-cx25840.fw
new file mode 100644 (file)
index 0000000..baa89ff
Binary files /dev/null and b/v4l-cx25840.fw differ