git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 787926b 7b66665)
Merge by hand (conflicts in scsi_lib.c)
authorJames Bottomley <jejb@titanic.(none)>
Thu, 15 Dec 2005 23:35:24 +0000 (17:35 -0600)
committerJames Bottomley <jejb@titanic.(none)>
Thu, 15 Dec 2005 23:35:24 +0000 (17:35 -0600)
This merge is pretty extensive.  The conflict is over the new
req->retries parameter, so I had to change the prototype to
scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st.

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

Trivial merge
Pandora Kernel Repository