From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Jun 2013 17:30:31 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=63edbce160c6d68c806e58db026b5881c6010e04;p=linux-beck.git

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
---

63edbce160c6d68c806e58db026b5881c6010e04