Sync with the changes pushed by Serge in the last merge window.
[cascardo/linux.git] / fs / devpts /
drwxr-xr-x   ..
-rw-r--r-- 140 Makefile
-rw-r--r-- 16694 inode.c