tree 1ada31d631d1a8ccec9b4aa9956c54db90c6efcf
parent a61aef7fc00bac9068e98bf00aaa38e766f19a57
parent 605c912bb843c024b1ed173dc427cd5c08e5d54d
author Linus Torvalds <torvalds@linux-foundation.org> 1372527031 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1372527031 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull ubifs fixes from Al Viro:
 "A couple of ubifs readdir/lseek race fixes.  Stable fodder, really
  nasty..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  UBIFS: fix a horrid bug
  UBIFS: prepare to fix a horrid bug