Merge v4.4-rc1 into MTD development

Sync up with the upstream development.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --cc drivers/mtd/devices/m25p80.c
Simple merge

diff --cc drivers/mtd/devices/mtd_dataflash.c
Simple merge

diff --cc drivers/mtd/mtdcore.c
Simple merge

diff --cc drivers/staging/mt29f_spinand/mt29f_spinand.c
index 49807de,47bb56f..6536066
--- 1/drivers/staging/mt29f_spinand/mt29f_spinand.c
--- 2/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@@ -853,9 -850,10 +850,9 @@@ static int spinand_probe(struct spi_dev
        struct nand_chip *chip;
        struct spinand_info *info;
        struct spinand_state *state;
 -      struct mtd_part_parser_data ppdata;
  
        info  = devm_kzalloc(&spi_nand->dev, sizeof(struct spinand_info),
-                       GFP_KERNEL);
+                            GFP_KERNEL);
        if (!info)
                return -ENOMEM;