Auto merge with /home/aegl/GIT/ia64-test
[pandora-kernel.git] / arch / um / scripts /
drwxr-xr-x   ..
-rw-r--r-- 1287 Makefile.rules
-rw-r--r-- 620 Makefile.unmap