[kernel] r15326 - in dists/sid/linux-2.6/debian/patches: bugfix/all series

[Ben Hutchings]

Author: benh
Date: Fri Mar  5 23:50:42 2010
New Revision: 15326

Log:
Correct attribution and licence of Sierra Wireless CIS files

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/firmware-Sierra-Wireless-CIS-copyright.patch
Modified:
   dists/sid/linux-2.6/debian/patches/series/10

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/firmware-Sierra-Wireless-CIS-copyright.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/firmware-Sierra-Wireless-CIS-copyright.patch	Fri Mar  5 23:50:42 2010	(r15326)
@@ -0,0 +1,35 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 5 Mar 2010 23:28:48 +0000
+Subject: [PATCH] Correct attribution and licence of Sierra Wireless CIS files
+
+These files have nothing to do with the pcmcia-cs project; they are
+distributed by Sierra Wireless under GPLv3.
+
+--- a/firmware/WHENCE
++++ b/firmware/WHENCE
+@@ -634,13 +634,22 @@ File: cis/MT5634ZLX.cis
+       cis/RS-COM-2P.cis
+       cis/COMpad2.cis
+       cis/COMpad4.cis
+-      cis/SW_555_SER.cis
++
++Licence: GPL
++
++Originally developed by the pcmcia-cs project
++
++--------------------------------------------------------------------------
++
++Driver: SERIAL_8520_CS - Serial PCMCIA adapter
++
++File: cis/SW_555_SER.cis
+       cis/SW_7xx_SER.cis
+       cis/SW_8xx_SER.cis
+ 
+-Licence: GPL
++Licence: GPLv3
+ 
+-Originally developed by the pcmcia-cs project
++Copyright Sierra Wireless
+ 
+ --------------------------------------------------------------------------
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/10
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/10	Fri Mar  5 02:24:25 2010	(r15325)
+++ dists/sid/linux-2.6/debian/patches/series/10	Fri Mar  5 23:50:42 2010	(r15326)
@@ -11,3 +11,4 @@
 + features/all/radeon-autoload-without-CONFIG_DRM_RADEON_KMS.patch
 + bugfix/all/qla2xxx-disable-broken-msi.patch
 + bugfix/sparc/sparc64-Make-prom-entry-spinlock-NMI-safe.patch
++ bugfix/all/firmware-Sierra-Wireless-CIS-copyright.patch