From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Aug 2014 01:01:41 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: submit/tizen/20160607.132125~4210
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f2609460c4a96ef19c6bd2dadea46ad47e6dfa1;p=sdk%2Femulator%2Femulator-kernel.git

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
---

1f2609460c4a96ef19c6bd2dadea46ad47e6dfa1