Merge by hand from Linus' tree.
[powerpc.git] / fs / devpts /
drwxr-xr-x   ..
-rw-r--r-- 140 Makefile
-rw-r--r-- 5095 inode.c