Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Dec 2014 21:02:27 +0000 (13:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Dec 2014 21:02:27 +0000 (13:02 -0800)
commit9a6b871d988cac4093a7be99de3cae000abda88b
tree5efb2348350b4637eac6c92b26171a9f7a13fe12
parent29169f823067b07bc2967f64ec4b6c9cd1a714a4
parent5242d422973d949c3b651efa049bcb1b5ef98ce9
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs fix from Al Viro:
 "An embarrassing bug in lustre patches from this cycle ;-/"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [regression] braino in "lustre: use is_root_inode()"