merge by hand - fix up rejections in Documentation/DocBook/Makefile
[powerpc.git] / arch / m32r / boot /
drwxr-xr-x   ..
-rw-r--r-- 442 Makefile
drwxr-xr-x - compressed
-rw-r--r-- 3702 setup.S