From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Aug 2012 04:50:40 +0000 (-0700)
Subject: Merge tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v3.6-rc4~22
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=f4673d6f185533a93990a12d283aead3b0177533

Merge tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs

Pull UBIFS fixes from Artem Bityutskiy:
 - Fix crash on error which prevents emulated power-cut testing.
 - Fix log reply regression introduced in 3.6-rc1.
 - Fix UBIFS complaints about too small debug buffer size which.
 - Fix error message spelling, and remove incorrect commentary.

* tag 'upstream-3.6-rc3' of git://git.infradead.org/linux-ubifs:
  UBIFS: fix error messages spelling
  UBIFS: fix complaints about too small debug buffer size
  UBIFS: fix replay regression
  UBIFS: fix crash on error path
  UBIFS: remove stale commentary
---

f4673d6f185533a93990a12d283aead3b0177533