Merge branch 'linus' into x86/tracehook
[linux-2.6] / arch / arm / mach-ixp23xx / Makefile.boot
1    zreladdr-y   := 0x00008000
2 params_phys-y   := 0x00000100