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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-integrator/include/mach/memory.h between commit
3ae4e9812941 ("ARM: 8113/1: remove remaining definitions of
PLAT_PHYS_OFFSET from <mach/memory.h>") from the arm tree and commit
e6dc195c1c69 ("ARM: integrator: get rid of <mach/memory.h>") from the
arm-soc tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

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

signature.asc
Description: PGP signature