From: Brian Norris <computersforpeace@gmail.com>
Date: Mon, 16 Nov 2015 04:30:53 +0000 (-0800)
Subject: Merge v4.4-rc1 into MTD development
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=617f41836c17688141e1c66f4156c2084f8ca86d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge v4.4-rc1 into MTD development

Sync up with the upstream development.

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

617f41836c17688141e1c66f4156c2084f8ca86d
diff --cc drivers/staging/mt29f_spinand/mt29f_spinand.c
index 49807de7d91e,47bb56f1f8c0..6536066b2349
--- a/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;