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

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

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