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

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

  zreladdr-y            += 0x10008000
params_phys-y           := 0x10000100
initrd_phys-y           := 0x10800000