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

mtd: cfi_cmdset_0002: Slight cleanup of fixup messages

2012-05-13 23:34:36 -05:00

devices

Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

2012-06-01 16:55:42 -07:00

lpddr

mtd: lpddr: replace open-coded ARRAY_SIZE with macro

2012-05-13 22:47:31 -05:00

maps

Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

2012-06-01 16:55:42 -07:00

nand

Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

2012-06-01 16:55:42 -07:00

onenand

mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN

2012-05-13 23:14:23 -05:00

tests

mtd: introduce mtd_can_have_bb helper

2012-01-09 18:26:24 +00:00

ubi

UBI: correct usage of IS_ENABLED()

2012-06-27 14:22:15 +03:00

afs.c

mtd: introduce mtd_read interface

2012-01-09 18:25:19 +00:00

ar7part.c

mtd: introduce mtd_read interface

2012-01-09 18:25:19 +00:00

bcm63xxpart.c

mtd: bcm63xxpart: handle Broadcom partition order

2012-05-13 22:55:03 -05:00

cmdlinepart.c

mtd: cmdlinepart: fix commentary

2012-05-13 23:03:36 -05:00

ftl.c

mtd: do not use mtd->sync directly

2012-01-09 18:26:21 +00:00

inftlcore.c

mtd: add leading underscore to all mtd functions

2012-03-27 00:20:01 +01:00

inftlmount.c

mtd: introduce mtd_block_markbad interface

2012-01-09 18:25:48 +00:00

Kconfig

mtd: of_parts: fix breakage in Kconfig

2012-06-01 20:06:59 +01:00

Makefile

mtd: maps: bcm963xx-flash: make CFE partition parsing an mtd parser

2012-01-09 18:15:31 +00:00

mtd_blkdevs.c

mtd: mtdblock: call mtd_sync() only if opened for write

2012-03-27 00:11:11 +01:00

mtdblock_ro.c

mtd: introduce mtd_write interface

2012-01-09 18:25:20 +00:00

mtdblock.c

mtd: mtdblock: call mtd_sync() only if opened for write

2012-03-27 00:11:11 +01:00

mtdchar.c

mtd: fix oops in dataflash driver

2012-05-07 20:29:50 +01:00

mtdconcat.c

mtd: unify initialization of erase_info->fail_addr

2012-03-27 01:02:24 +01:00

mtdcore.c

mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN

2012-05-13 23:14:23 -05:00

mtdcore.h

mtd: hide parse_mtd_partitions

2011-09-11 15:02:13 +03:00

mtdoops.c

kmsg - kmsg_dump() use iterator to receive log buffer content

2012-06-15 14:53:59 -07:00

mtdpart.c

mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN

2012-05-13 23:14:23 -05:00

mtdsuper.c

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

mtdswap.c

mtd: do not use mtd->block_markbad directly

2012-01-09 18:26:26 +00:00

nftlcore.c

mtd: nftlcore: remove out-of-date and now irrelevant piece of code

2012-03-27 00:24:03 +01:00

nftlmount.c

mtd: introduce mtd_block_markbad interface

2012-01-09 18:25:48 +00:00

ofpart.c

mtd: ofpart: add ofoldpart alias

2011-09-11 15:02:14 +03:00

redboot.c

mtd: redboot: remove useless code

2012-03-27 00:24:14 +01:00

rfd_ftl.c

mtd: do not use mtd->sync directly

2012-01-09 18:26:21 +00:00

sm_ftl.c

mtd: sm_ftl: fix typo in major number.

2012-03-27 01:01:26 +01:00

sm_ftl.h

mtd: sm_ftl: cosmetic, use bool when possible

2010-10-25 01:33:08 +01:00

ssfdc.c

mtd: introduce mtd_block_isbad interface

2012-01-09 18:25:47 +00:00