Merge branch 'for-next' into for-linus

[linux-2.6/x86.git] / arch / arm / mach-mx1 / Makefile.boot

   zreladdr-y   := 0x08008000
params_phys-y   := 0x08000100
initrd_phys-y   := 0x08800000