Linus Torvalds c6ef814509 This pull request fixes a bug introduced during the v4.0 merge window where we ... forgot to put braces where they should be. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVC8rvAAoJECmIfjd9wqK0DbUP/23tBzSS4rm1CB5X/MBDhyhr JUryy+pdlNq0WCbcljxg769NII1xdY3Ka+5rtW0IfGE9qfmeR2xek3qdaNtjjYuh QnvZrvqdjEotx2dZkqDVZwuT33LgXliZlqCDIfNqTzMfatwP90/53wARyUPF9rJY u3/67w5ompSRr4Okl5BErdGy+AyrE2o3fiI10CWrX74xjQAmhhmX3UH4y+PMyvwN 3QIQ8n5ECNRphMBP7clcFQGRGcVVflGuEn2boApRICJVaDJugJAf813ZrHuDl9dt Tsw+jy6x/bCaFXXXxh35KzpZoB7LTgZ/7kisoGH77HS+7seQERCPS49vatKxXESD ZM/BaX/BZ9wu3EWr7dNmlc/NMU1ykbcUr/BRjkeQ/hXSexO2GYryD/ysMBJVd3wn TAxSgp4zjkXlkcntgtLM6wwR+kSKffQy5xpvoUQSK4QvVOVrsXWizvfj652toYQs +m5CW0fF/CIjeqmxFpdC6NGITmTAmblUAPZJrYpTzrV1zOF0hO8b2EKdziP5qyDY kLlaU90MxSPMImSuEcRwku5KQMtF+b2OesW2QrPKPKkwT4j/IJeme5h4aKsWNGGP MxEOBkKctOARAus2ryLB9g99hTXmYbmcWKoc/4PYyjOXh1KvpQ6+HiHNeilZ0HBP Gkw0axRGpjdQTItnTyOr =SIBr -----END PGP SIGNATURE----- Merge tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs Pull UBI fix from Artem Bityutskiy: "This fixes a bug introduced during the v4.0 merge window where we forgot to put braces where they should be" * tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs: UBI: fix missing brace control flow		2015-03-21 10:36:44 -07:00
..
chips	mtd: map_rom: Support UBI on ROM	2015-01-09 23:24:27 -08:00
devices	mtd: st_spi_fsm: Fix [-Wsign-compare] build warning	2015-01-12 21:08:10 -08:00
lpddr	mtd: lpddr: fix Kconfig dependency, for I/O accessors	2014-05-26 10:38:25 -07:00
maps	mtd: physmap_of: Add read-only fallback	2015-01-09 23:22:40 -08:00
nand	mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA	2015-03-02 22:55:56 -08:00
onenand	mtd: onenand: drop owner assignment from platform_drivers	2014-10-20 16:20:59 +02:00
spi-nor	mtd: fsl-quadspi: improve read performance by increase AHB transfer size	2015-02-05 20:01:08 -08:00
tests	mtd: tests: abort torturetest on erase errors	2014-12-12 19:28:43 -08:00
ubi	UBI: fix missing brace control flow	2015-02-23 22:17:24 +01:00
afs.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
ar7part.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
bcm47xxpart.c	mtd: bcm47xxpart: support SquashFS with an original magic	2015-01-07 12:24:23 -08:00
bcm63xxpart.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
cmdlinepart.c	mtd: cmdlinepart: Spelling s/trucate/truncate/	2014-07-02 15:17:15 -07:00
ftl.c	mtd/ftl: fix the double free of the buffers allocated in build_maps()	2014-07-14 18:41:20 -07:00
inftlcore.c
inftlmount.c	mtd: intflmount: fix off by one error in INFTL_dumpVUchains()	2014-11-05 13:19:21 -08:00
Kconfig	mtd: update help of CONFIG_MTD_OF_PARTS	2014-11-05 01:17:56 -08:00
Makefile	mtd: spi-nor: shorten Kconfig naming	2014-04-14 11:23:01 -07:00
mtd_blkdevs.c	block: disable entropy contributions for nonrot devices	2014-10-04 10:55:32 -06:00
mtdblock_ro.c
mtdblock.c	mtd: mtdblock: remove the needless mtdblks_lock	2015-01-07 12:51:56 -08:00
mtdchar.c	fs: introduce f_op->mmap_capabilities for nommu mmap support	2015-01-20 14:02:58 -07:00
mtdconcat.c	MTD updates for 3.20-rc1	2015-02-18 08:01:44 -08:00
mtdcore.c	MTD updates for 3.20-rc1	2015-02-18 08:01:44 -08:00
mtdcore.h
mtdoops.c
mtdpart.c	fs: introduce f_op->mmap_capabilities for nommu mmap support	2015-01-20 14:02:58 -07:00
mtdsuper.c
mtdswap.c	mtd: use __packed shorthand	2014-08-19 11:53:08 -07:00
nftlcore.c
nftlmount.c	mtd: nftl: reorganize operations in condition check	2015-01-09 15:26:29 -08:00
ofpart.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
redboot.c	mtd: make register_mtd_parser return void	2014-01-03 11:22:22 -08:00
rfd_ftl.c	mtd: remove some duplicative checks	2014-03-10 22:42:25 -07:00
sm_ftl.c	mtd: sm_ftl: initialize error code	2014-08-19 11:53:07 -07:00
sm_ftl.h
ssfdc.c