git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29454dd d6b0c53)
Merge ../scsi-misc-2.6
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Mon, 3 Jul 2006 14:41:12 +0000 (09:41 -0500)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Mon, 3 Jul 2006 14:41:12 +0000 (09:41 -0500)
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>

Trivial merge
Pandora Kernel Repository