tree a152beb5e8679e94430c5b47bf798dd8a2d4fd5d
parent 787926b1b2d21d42ca462dc736b77f1a4a30c503
parent 7b6666530e2736f190a2629c8abe34275054449f
author James Bottomley <jejb@titanic.(none)> 1134689724 -0600
committer James Bottomley <jejb@titanic.(none)> 1134689724 -0600

Merge by hand (conflicts in scsi_lib.c)

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>