Merge branch 'marvell_cleanup_for_v3.5' of git://git.infradead.org/users/jcooper...

[~andy/linux] / arch / arm / mach-orion5x / Makefile.boot

   zreladdr-y   += 0x00008000
params_phys-y   := 0x00000100
initrd_phys-y   := 0x00800000