Merge tag 'for-f2fs-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[~andy/linux] / arch / arm / mach-lpc32xx / Makefile.boot

   zreladdr-y   += 0x80008000
params_phys-y   := 0x80000100
initrd_phys-y   := 0x82000000