Merge tag 'for-linus-v3.11-rc1-2' of git://oss.sgi.com/xfs/xfs
[linux.git] / fs / devpts /
drwxr-xr-x   ..
-rw-r--r-- 140 Makefile
-rw-r--r-- 16644 inode.c