linux-next: manual merge of the semaphore-removal tree

Hi Willy,

Today's linux-next merge of the semaphore-removal tree got conflicts in
drivers/scsi/qla2xxx/qla_attr.c, drivers/scsi/qla2xxx/qla_mid.c and
drivers/scsi/qla2xxx/qla_os.c between various commits from Linus' tree
and the scsi tree and commits 5469811b8b0085c0f19fd3aaad29cde59761e243
("qla2xxx: Turn vport_sem into vport_mutex") and
e2c6f1aa2f67c585ffcb879d32ff3e74b53faf25 ("Convert qla_os to use mutex
instead of semaphore") from the semaphore-removal tree.

The scsi tree did the conversion from semaphores in this code a long time
ago (and that conversion is now done in Linus' tree), so I just reverted
the latter two commits.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/