From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Sep 2013 19:36:55 +0000 (-0400)
Subject: Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: firefly_0821_release~176^2~5292
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=098e7f1665f1a3503524bdd537499e45ad30e67d;p=firefly-linux-kernel-4.4.55.git

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

Pull ubifs fix from Artem Bityutskiy:
 "Just one patch which fixes the power-cut recovery testing mode.

  I'll start using a single UBI/UBIFS tree instead of 2 trees from now
  on.  So in the future you'll get 1 small pull request instead of 2
  tiny ones"

* tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: remove invalid warn msg with tst_recovery enabled
---

098e7f1665f1a3503524bdd537499e45ad30e67d