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

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-ep93xx/Makefile.boot between commit 86783a0c544d ("ARM:
7022/1: allow to detect conflicting zreladdrs") from the arm tree and
commit 758ab7e2046d ("ARM: mach-ep93xx: remove mach/memory.h and Kconfig
selection of SDRAM bank") from the arm-soc tree.

The latter commit just emptied the file (without deleteing it), so I did
that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature