Merge branch 'from-linus' into upstream
[linux-2.6] / fs / hugetlbfs /
drwxr-xr-x   ..
-rw-r--r-- 112 Makefile
-rw-r--r-- 19991 inode.c