Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6/libata-dev.git] / arch / arm / mach-davinci / Makefile.boot

   zreladdr-y   := 0x80008000
params_phys-y   := 0x80000100
initrd_phys-y   := 0x80800000