Merge branch 'restriper' of git://github.com/idryomov/btrfs-unstable into integration

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

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