Merge branches 'upstream' and 'ntrig-multitouch' into for-linus
[linux-2.6] / arch / arm / mach-mmp / Makefile.boot
1    zreladdr-y   := 0x00008000