Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[sfrench/cifs-2.6.git] / arch / arm / mach-ixp4xx / Makefile.boot
1    zreladdr-y   := 0x00008000
2 params_phys-y   := 0x00000100
3