git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3860c97 8ebf975)
[SCSI] Merge branch 'linus'
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 12 Jun 2009 15:02:03 +0000 (10:02 -0500)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 12 Jun 2009 15:02:03 +0000 (10:02 -0500)
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>

Trivial merge
Pandora Kernel Repository