From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Jul 2012 18:42:30 +0000 (-0700)
Subject: Merge tag 'upstream-3.5-rc8' of git://git.infradead.org/linux-ubifs
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=17934162875ef93fefbf5df9dfc46b7c07828fd1;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'upstream-3.5-rc8' of git://git.infradead.org/linux-ubifs

Pull UBIFS free space fix-up bugfix from Artem Bityutskiy:
 "It's been reported already twice recently:

    http://lists.infradead.org/pipermail/linux-mtd/2012-May/041408.html
    http://lists.infradead.org/pipermail/linux-mtd/2012-June/042422.html

  and we finally have the fix.  I am quite confident the fix is correct
  because I could reproduce the problem with nandsim and verify the fix.
  It was also verified by Iwo (the reporter).

  I am also confident that this is OK to merge the fix so late because
  this patch affects only the fixup functionality, which is not used by
  most users."

* tag 'upstream-3.5-rc8' of git://git.infradead.org/linux-ubifs:
  UBIFS: fix a bug in empty space fix-up
---

17934162875ef93fefbf5df9dfc46b7c07828fd1