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

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

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