Merge branch 'topic/nomm' into for-linus
[sfrench/cifs-2.6.git] / arch / arm / mach-s5pv210 / Makefile.boot
1    zreladdr-y   := 0x20008000
2 params_phys-y   := 0x20000100