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

Trivial merge