Linus Torvalds 9a7c6b73c4 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

2012-06-28 11:41:43 -07:00

..

chips

…

devices

…

lpddr

…

maps

…

nand

…

onenand

…

tests

…

ubi

…

afs.c

…

ar7part.c

…

bcm63xxpart.c

…

cmdlinepart.c

…

ftl.c

…

inftlcore.c

…

inftlmount.c

…

Kconfig

…

Makefile

…

mtd_blkdevs.c

…

mtdblock_ro.c

…

mtdblock.c

…

mtdchar.c

…

mtdconcat.c

…

mtdcore.c

…

mtdcore.h

…

mtdoops.c

…

mtdpart.c

…

mtdsuper.c

…

mtdswap.c

…

nftlcore.c

…

nftlmount.c

…

ofpart.c

…

redboot.c

…

rfd_ftl.c

…

sm_ftl.c

…

sm_ftl.h

…

ssfdc.c

…