Merge branches 'upstream' and 'upstream-fixes' into for-linus
[pandora-kernel.git] / arch / arm / mach-s5p64x0 / Makefile.boot
1    zreladdr-y   := 0x20008000
2 params_phys-y   := 0x20000100