Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux/fpc-iii.git] / arch / arm / mach-omap2 / Makefile.boot

  zreladdr-y            += 0x80008000
params_phys-y           := 0x80000100
initrd_phys-y           := 0x80800000