Merge tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux

[linux/fpc-iii.git] / arch / arm / mach-prima2 / Makefile.boot

zreladdr-y              += 0x00008000
params_phys-y           := 0x00000100
initrd_phys-y           := 0x00800000