Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
[powerpc.git] / arch / um / scripts /
drwxr-xr-x   ..
-rw-r--r-- 1595 Makefile.rules
-rw-r--r-- 613 Makefile.unmap