linux-next: manual merge of the akpm tree with the devicetree tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/of/fdt.c between commit e55b0829cbac ("of: fdt: Constify
'pathp'") from the devicetree tree and commit "drivers/of/fdt.c: re-use
kernel's kbasename()" from the akpm tree.

I fixed it up (using the akpm tree patch) and can carry the fix as
necessary (no action is required).

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

pgpug2nKzDfZv.pgp
Description: PGP signature