]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7ffa93eadac254e1e4f6adce25e295a037bcdb13
tree1084e6380e8993f5db802e849d0bfae5bc5fbed5
parent1be90b41ed3cefc2dc60925a6a120753364969c9
parent4012c04832635ab54b56cce65fd5276c224aa9f2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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