merge by hand - fix up rejections in Documentation/DocBook/Makefile
[linux-2.6] / arch / i386 / boot / compressed /
drwxr-xr-x   ..
-rw-r--r-- 647 Makefile
-rw-r--r-- 2872 head.S
-rw-r--r-- 9169 misc.c
-rw-r--r-- 130 vmlinux.scr