linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
Documentation/devicetree/bindings/usb/platform-uhci.txt between commit
100d45970327 ("ARM: vt8500: Add support for UHCI companion controller")
from the usb tree and commit 95e9fd10f06c ("arm: vt8500: doc: Add device
tree bindings for arch-vt8500 devices") from the arm-soc tree.

I used the version from the arm-soc tree and can carry the fix as
necessary (no action is required).

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

pgplls4CcdlLM.pgp
Description: PGP signature