Merge by hand (whitespace conflicts in libata.h)
[firefly-linux-kernel-4.4.55.git] / fs / hugetlbfs /
drwxr-xr-x   ..
-rw-r--r-- 112 Makefile
-rw-r--r-- 20979 inode.c