Merge branch 'linus' into perfcounters/core
[linux-2.6] / fs / devpts /
drwxr-xr-x   ..
-rw-r--r-- 140 Makefile
-rw-r--r-- 13951 inode.c