From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Fri, 12 Jun 2009 15:02:03 +0000 (-0500)
Subject: [SCSI] Merge branch 'linus'
X-Git-Tag: v2.6.31-rc1~365^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82681a318f9f028ea64e61f24bbd9ac535531921;p=pandora-kernel.git

[SCSI] Merge branch 'linus'

Conflicts:
	drivers/message/fusion/mptsas.c

fixed up conflict between req->data_len accessors and mptsas driver updates.

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

82681a318f9f028ea64e61f24bbd9ac535531921
Reading git-diff-tree failed