Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
[pandora-kernel.git] / arch / arm / mach-mmp / Makefile.boot
1    zreladdr-y   += 0x00008000