From: James Bottomley <jejb@mulgrave.il.steeleye.com>
Date: Mon, 3 Jul 2006 14:41:12 +0000 (-0500)
Subject: Merge ../scsi-misc-2.6
X-Git-Tag: v2.6.18-rc1~22^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4e00fac42f268ed0a547cdd1d12bb8399864040;p=pandora-kernel.git

Merge ../scsi-misc-2.6

Conflicts:

	drivers/scsi/nsp32.c
	drivers/scsi/pcmcia/nsp_cs.c

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

c4e00fac42f268ed0a547cdd1d12bb8399864040
Reading git-diff-tree failed