Merge branch 'master' into for-linus
[sfrench/cifs-2.6.git] / arch / arm / mach-vexpress / Makefile.boot
1    zreladdr-y   := 0x60008000
2 params_phys-y   := 0x60000100
3 initrd_phys-y   := 0x60800000