Merge mainline (v2.6.34-rc7)
[sfrench/cifs-2.6.git] / arch / arm / mach-s5p6442 / Makefile.boot
1    zreladdr-y   := 0x20008000
2 params_phys-y   := 0x20000100