Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm...

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

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