---

yaml
---
r: 29276
b: refs/heads/master
c: 89f48c4
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5006ecc2d5073d4e52f54381fd0fee1575d4ce22
+refs/heads/master: 89f48c4d67dd875cf2216d4402bf77eda41fbdd9

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

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,

trunk/Documentation/pci.txt

@@ -259,17 +259,7 @@ on the bus need to be capable of doing it, so this is something which needs
 to be handled by platform and generic code, not individual drivers.
 
 
-8. Vendor and device identifications
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-For the future, let's avoid adding device ids to include/linux/pci_ids.h.
-
-PCI_VENDOR_ID_xxx for vendors, and a hex constant for device ids.
-
-Rationale:  PCI_VENDOR_ID_xxx constants are re-used, but device ids are not.
-    Further, device ids are arbitrary hex numbers, normally used only in a
-    single location, the pci_device_id table.
-
-9. Obsolete functions
+8. Obsolete functions
 ~~~~~~~~~~~~~~~~~~~~~
 There are several functions which you might come across when trying to
 port an old driver to the new PCI interface.  They are no longer present

trunk/Documentation/power/video.txt

@@ -140,7 +140,7 @@ IBM TP T41p			s3_bios (2), switch to X after resume
 IBM TP T42			s3_bios (2)
 IBM ThinkPad T42p (2373-GTG)	s3_bios (2)
 IBM TP X20			??? (*)
-IBM TP X30			s3_bios, s3_mode (4)
+IBM TP X30			s3_bios (2)
 IBM TP X31 / Type 2672-XXH      none (1), use radeontool (http://fdd.com/software/radeon/) to turn off backlight.
 IBM TP X32			none (1), but backlight is on and video is trashed after long suspend. s3_bios,s3_mode (4) works too. Perhaps that gets better results?
 IBM Thinkpad X40 Type 2371-7JG  s3_bios,s3_mode (4)

trunk/Documentation/scsi/ChangeLog.megaraid

@@ -1,28 +1,3 @@
-Release Date	: Mon Apr 11 12:27:22 EST 2006 - Seokmann Ju <sju@lsil.com>
-Current Version : 2.20.4.8 (scsi module), 2.20.2.6 (cmm module)
-Older Version	: 2.20.4.7 (scsi module), 2.20.2.6 (cmm module)
-
-1.	Fixed a bug in megaraid_reset_handler().
-	Customer reported "Unable to handle kernel NULL pointer dereference
-	at virtual address 00000000" when system goes to reset condition
-	for some reason. It happened randomly.
-	Root Cause: in the megaraid_reset_handler(), there is possibility not
-	returning pending packets in the pend_list if there are multiple
-	pending packets.
-	Fix: Made the change in the driver so that it will return all packets
-	in the pend_list.
-
-2.	Added change request.
-	As found in the following URL, rmb() only didn't help the
-	problem. I had to increase the loop counter to 0xFFFFFF. (6 F's)
-	http://marc.theaimsgroup.com/?l=linux-scsi&m=110971060502497&w=2
-
-	I attached a patch for your reference, too.
-	Could you check and get this fix in your driver?
-
-	Best Regards,
-	Jun'ichi Nomura
-
 Release Date	: Fri Nov 11 12:27:22 EST 2005 - Seokmann Ju <sju@lsil.com>
 Current Version : 2.20.4.7 (scsi module), 2.20.2.6 (cmm module)
 Older Version	: 2.20.4.6 (scsi module), 2.20.2.6 (cmm module)