Merge remote-tracking branch 's5p/for-next'

[linux-2.6/next.git] / arch / arm / mach-prima2 / Makefile.boot

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