Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Dec 2015 01:46:29 +0000 (17:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Dec 2015 01:46:29 +0000 (17:46 -0800)
commite25bd6ca8fd8fca2e0148bef257479eee3fff9b5
treeeb103dc573b0d6a3c2ee7a99f832872a8733b7e4
parent1e60508c3f4dc0be629e5b70b31d42c0d053109b
parent76cc404bfdc0d419c720de4daaf2584542734f42
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs fix from Al Viro:
 "Fix for 3.15 breakage of fcntl64() in arm OABI compat.  -stable
  fodder"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [PATCH] arm: fix handling of F_OFD_... in oabi_fcntl64()