From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Nov 2013 06:28:45 +0000 (+0900)
Subject: Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v3.13-rc1~110
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fbe43ff0031ded2b8500382da17d5d815a9c3edd;p=karo-tx-linux.git

Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs

Pull ubifs changes from Artem Bityutskiy:
 "Mostly fixes for the power cut emulation UBIFS mode, and only one
  functional change which fixes a return error code"

* tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: correct data corruption range
  UBIFS: fix return code
  UBIFS: remove unnecessary code in ubifs_garbage_collect
---

fbe43ff0031ded2b8500382da17d5d815a9c3edd