Merge tag 'v3.10.17' into dev-kernel-3.10
[linux-3.10.git] / fs / devpts /
drwxr-xr-x ..
-rw-r--r-- Makefile
-rw-r--r-- inode.c