From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Mar 2015 17:36:44 +0000 (-0700)
Subject: Merge tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs
X-Git-Tag: firefly_0821_release~176^2~2128
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c6ef814509fedb4ab4b5dc5bdca309d4e7181597;p=firefly-linux-kernel-4.4.55.git

Merge tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs

Pull UBI fix from Artem Bityutskiy:
 "This fixes a bug introduced during the v4.0 merge window where we
  forgot to put braces where they should be"

* tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs:
  UBI: fix missing brace control flow
---

c6ef814509fedb4ab4b5dc5bdca309d4e7181597