Merge branch 'ufs' into for-next

This commit is contained in:
Al Viro 2015-08-18 23:52:47 -04:00
commit b5f5914cb8
6 changed files with 644 additions and 882 deletions