Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Oct 2012 01:11:48 +0000 (18:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Oct 2012 01:11:48 +0000 (18:11 -0700)
commitecb2ecd9c241de16ebb31b7dc441dbbfc0f6006e
treec55b5cdf7a993e303f1f85b270e0e512f526fdd5
parentafe594c79138ba6125b195a0b01fd28c34e3a993
parentc54d0dc35324300cdc502137f5c0ee44f53d7a8b
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "Fix for my braino in replace_fd(), dhowell's fix for the fallout from
  over-enthusiastic bo^Wdeclaration movements plus crapectomy that
  should've happened a long time ago (SEL_...  definitions)."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  bury SEL_{IN,OUT,EX}
  Unexport some bits of linux/fs.h
  fix a leak in replace_fd() users