Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually
[pandora-kernel.git] / fs / devpts /
drwxr-xr-x   ..
-rw-r--r-- 140 Makefile
-rw-r--r-- 5095 inode.c