linux-next: manual merge of the usb tree with the acpi tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa ("usb-acpi:
Comply with the ACPI API change") from the acpi tree and commit
05f916894a69 ("usb/acpi: Store info on device removability") from the usb
tree.

The latter removed the function changed by the former, so I just did that
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpmz5jPsrrJg.pgp
Description: PGP signature