[IA64] Manual merge fix for 3 files
[powerpc.git] / arch / h8300 / boot /
drwxr-xr-x   ..
-rw-r--r-- 321 Makefile