projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f88cf23 6d2b617)
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)
commit1f2609460c4a96ef19c6bd2dadea46ad47e6dfa1
tree1084e6380e8993f5db802e849d0bfae5bc5fbed5tree | snapshot
parentf88cf230a43e08b3fb615e0520900a414f037440commit | diff
parent6d2b6170c8914c6c69256b687651fb16d7ec3e18commit | diff
Merge branch 'for-linus' of git://git./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
John Crispins staging tree