Merge branch 'nsfs' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 11 Dec 2014 02:31:59 +0000 (21:31 -0500)
commit707c5960f102f8cdafb9406047b158abc71b391f
tree31d195b1c48cefa2d04da7cc801824f87a0a9887
parentba00410b8131b23edfb0e09f8b6dd26c8eb621fb
parent3d3d35b1e94ec918fc0ae670663235bf197d8609
Merge branch 'nsfs' into for-next
fs/Makefile
init/main.c