Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Aug 2014 01:01:41 +0000 (18:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Aug 2014 01:01:41 +0000 (18:01 -0700)
Pull vfs fixes from Al Viro:
 "This contains a couple of fixes - one is the aio fix from Christoph,
  the other a fallocate() one from Eric"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: fix check for fallocate on active swapfile
  direct-io: fix AIO regression


Trivial merge