linux-next: manual merge of the scsi tree with the pci tree

[Stephen Rothwell]

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
drivers/scsi/qla2xxx/qla_nx.c between commit 100924388407 ("[SCSI]
qla4xxx: Use PCI Express Capability accessors") from the pci tree and
commit 8fbb85e5f4c0 ("[SCSI] qla2xxx: Wrong PCIe(2.5Gb/s x8) speed in the
kerenel message for ISP82xx") from the scsi tree.

The latter removes one of the functions updated by the former.  So I
removed it and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature