Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

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