merge by hand - fix up rejections in Documentation/DocBook/Makefile
[linux-2.6] / arch / um / scripts /
drwxr-xr-x   ..
-rw-r--r-- 1120 Makefile.rules