From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Jun 2012 18:41:43 +0000 (-0700)
Subject: Merge tag 'upstream-3.5-rc5' of git://git.infradead.org/linux-ubifs
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=9a7c6b73c40e916861eb852dc5855ffb3d58a3cd;p=linux-edison.git

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

Pull ubi/ubifs fixes from Artem Bityutskiy:
 "Fix the debugfs regression - we never enable it because incorrect
  'IS_ENABLED()' macro usage: should be 'IS_ENABLED(CONFIG_DEBUG_FS)',
  but we had 'IS_ENABLED(DEBUG_FS)'.  Also fix incorrect assertion."

* tag 'upstream-3.5-rc5' of git://git.infradead.org/linux-ubifs:
  UBI: correct usage of IS_ENABLED()
  UBIFS: correct usage of IS_ENABLED()
  UBIFS: fix assertion
---

9a7c6b73c40e916861eb852dc5855ffb3d58a3cd