From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jun 2012 18:04:06 +0000 (-0700)
Subject: Merge tag 'upstream-3.5-rc2' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v3.5-rc2~7
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=e72643088f576032d0d30c1d62c8fc077f383edc;p=~andy%2Flinux

Merge tag 'upstream-3.5-rc2' of git://git.infradead.org/linux-ubifs

Pull UBI/UBIFS fixes from Artem Bityutskiy:
 "Fix UBI and UBIFS - they refuse to work without debugfs.  This was
  broken by the 3.5-rc1 UBI/UBIFS changes when we removed the debugging
  Kconfig switches.

  Also, correct locking in 'ubi_wl_flush()' - it was extended to support
  flushing a specific LEB in 3.5-rc1, and the locking was sub-optimal."

* tag 'upstream-3.5-rc2' of git://git.infradead.org/linux-ubifs:
  UBI: correct ubi_wl_flush locking
  UBIFS: fix debugfs-less systems support
  UBI: fix debugfs-less systems support
---

e72643088f576032d0d30c1d62c8fc077f383edc