Merge branch 'nsfs' into for-next

This commit is contained in:
Al Viro 2014-12-10 21:31:59 -05:00
commit 707c5960f1
27 changed files with 353 additions and 297 deletions