Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

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

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