---

yaml --- r: 28662 b: refs/heads/master c: d6c1a90 h: refs/heads/master v: v3
git-mirror · Apr 22, 2006 · 20ef63c · 20ef63c
1 parent f3365e2
commit 20ef63c
Show file tree

Hide file tree

Showing 3,584 changed files with 105,492 additions and 137,321 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d588fcbe5a7ba8bba2cebf7799ab2d573717a806
+refs/heads/master: d6c1a9081080c6c4658acf2a06d851feb2855933
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -1194,9 +1194,15 @@ S: Brecksville, OH  44141-1334
 S: USA
 
 N: Tristan Greaves
-E: tristan@extricate.org
-W: http://www.extricate.org/
+E: Tristan.Greaves@icl.com
+E: tmg296@ecs.soton.ac.uk
+W: http://www.ecs.soton.ac.uk/~tmg296
 D: Miscellaneous ipv4 sysctl patches
+S: 15 Little Mead
+S: Denmead
+S: Hampshire
+S: PO7 6HS
+S: United Kingdom
 
 N: Michael A. Griffith
 E: grif@cs.ucr.edu
@@ -3241,9 +3247,14 @@ S: 12725 SW Millikan Way, Suite 400
 S: Beaverton, Oregon 97005
 S: USA
 
-N: Marcelo Tosatti
-E: marcelo@kvack.org
+N: Marcelo W. Tosatti
+E: marcelo.tosatti@cyclades.com
+D: Miscellaneous kernel hacker
 D: v2.4 kernel maintainer
+D: Current pc300/cyclades maintainer
+S: Cyclades Corporation
+S: Av Cristovao Colombo, 462. Floresta.
+S: Porto Alegre
 S: Brazil
 
 N: Stefan Traby

diff --git a/trunk/Documentation/ABI/README b/trunk/Documentation/ABI/README
diff --git a/trunk/Documentation/ABI/obsolete/devfs b/trunk/Documentation/ABI/obsolete/devfs
diff --git a/trunk/Documentation/ABI/stable/syscalls b/trunk/Documentation/ABI/stable/syscalls
diff --git a/trunk/Documentation/ABI/stable/sysfs-module b/trunk/Documentation/ABI/stable/sysfs-module
diff --git a/trunk/Documentation/ABI/testing/sysfs-class b/trunk/Documentation/ABI/testing/sysfs-class
diff --git a/trunk/Documentation/ABI/testing/sysfs-devices b/trunk/Documentation/ABI/testing/sysfs-devices
diff --git a/trunk/Documentation/HOWTO b/trunk/Documentation/HOWTO
@@ -603,8 +603,7 @@ start exactly where you are now.
 
 
 ----------
-Thanks to Paolo Ciarrocchi who allowed the "Development Process"
-(http://linux.tar.bz/articles/2.6-development_process) section
+Thanks to Paolo Ciarrocchi who allowed the "Development Process" section
 to be based on text he had written, and to Randy Dunlap and Gerrit
 Huizenga for some of the list of things you should and should not say.
 Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,

diff --git a/trunk/Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen b/trunk/Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
diff --git a/trunk/Documentation/arm/Sharp-LH/LCDPanels b/trunk/Documentation/arm/Sharp-LH/LCDPanels
diff --git a/trunk/Documentation/devices.txt b/trunk/Documentation/devices.txt
@@ -1721,6 +1721,11 @@ Your cooperation is appreciated.
 		These devices support the same API as the generic SCSI
 		devices.
 
+ 97 block	Packet writing for CD/DVD devices
+		  0 = /dev/pktcdvd0	First packet-writing module
+		  1 = /dev/pktcdvd1	Second packet-writing module
+		    ...
+
  98 char	Control and Measurement Device (comedi)
 		  0 = /dev/comedi0	First comedi device
 		  1 = /dev/comedi1	Second comedi device

diff --git a/trunk/Documentation/dvb/get_dvb_firmware b/trunk/Documentation/dvb/get_dvb_firmware
@@ -259,18 +259,18 @@ sub dibusb {
 }
 
 sub nxt2002 {
-    my $sourcefile = "Technisat_DVB-PC_4_4_COMPACT.zip";
+    my $sourcefile = "Broadband4PC_4_2_11.zip";
     my $url = "http://www.bbti.us/download/windows/$sourcefile";
-    my $hash = "476befae8c7c1bb9648954060b1eec1f";
+    my $hash = "c6d2ea47a8f456d887ada0cfb718ff2a";
     my $outfile = "dvb-fe-nxt2002.fw";
     my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
 
     checkstandard();
 
     wgetfile($sourcefile, $url);
     unzip($sourcefile, $tmpdir);
-    verify("$tmpdir/SkyNET.sys", $hash);
-    extract("$tmpdir/SkyNET.sys", 331624, 5908, $outfile);
+    verify("$tmpdir/SkyNETU.sys", $hash);
+    extract("$tmpdir/SkyNETU.sys", 375832, 5908, $outfile);
 
     $outfile;
 }