From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 May 2014 14:48:50 +0000 (-0700)
Subject: Merge tag 'upstream-3.15-rc5' of git://git.infradead.org/linux-ubifs
X-Git-Tag: MMI-PSA29.97-13-9~12257
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cae1d2cab43bb34c242f272da499bf5f25d778c7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull ubifs fixes from Artem Bityutskiy:
 "This includes the following fixes:

   - two real bug-fixes from Tanya for the still "experimental" UBI
     fastmap feature
   - a one-liner from Kees which hardens kernel security
   - a small error-path fix, where we forget to free various resources
     in case of failure - spotted by the 'smatch' tool"

* tag 'upstream-3.15-rc5' of git://git.infradead.org/linux-ubifs:
  UBI: avoid workqueue format string leak
  UBI: fix ubi free PEBs count calculation
  UBI: fix error path in __wl_get_peb
  UBIFS: fix remount error path
---

cae1d2cab43bb34c242f272da499bf5f25d778c7