---

yaml
---
r: 26676
b: refs/heads/master
c: 6f9c296
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d38eddab9ce6de3a9d6d583043dfa97b6bc0d3b
+refs/heads/master: 6f9c2963888e60e46a9e0bd09a25740abce29262

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)

trunk/MAINTAINERS

@@ -1480,11 +1480,10 @@ L:	netdev@vger.kernel.org
 S:	Maintained
 
 IRDA SUBSYSTEM
-P:	Samuel Ortiz
-M:	samuel@sortiz.org
+P:	Jean Tourrilhes
 L:	irda-users@lists.sourceforge.net (subscribers-only)
 W:	http://irda.sourceforge.net/
-S:	Maintained
+S:	Odd Fixes
 
 ISAPNP
 P:	Jaroslav Kysela

trunk/Makefile

@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 17
-EXTRAVERSION =-rc4
+EXTRAVERSION =-rc3
 NAME=Sliding Snow Leopard
 
 # *DOCUMENTATION*