Merge branch '9p-iov_iter' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:28:58 +0000 (22:28 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:28:58 +0000 (22:28 -0400)

Trivial merge