projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a61aef7 605c912)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Jun 2013 17:30:31 +0000 (10:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Jun 2013 17:30:31 +0000 (10:30 -0700)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.