Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand...

diff --cc drivers/mtd/nand/atmel/nand-controller.c
Simple merge

diff --cc drivers/mtd/nand/lpc32xx_mlc.c
Simple merge

diff --cc drivers/mtd/nand/lpc32xx_slc.c
Simple merge

diff --cc drivers/mtd/nand/mxc_nand.c
Simple merge

diff --cc drivers/mtd/nand/nand_base.c
Simple merge

diff --cc drivers/mtd/nand/nand_hynix.c
Simple merge

diff --cc drivers/mtd/nand/orion_nand.c
Simple merge

diff --cc drivers/mtd/nand/oxnas_nand.c
Simple merge

diff --cc drivers/mtd/nand/qcom_nandc.c
Simple merge

diff --cc drivers/mtd/nand/sh_flctl.c
Simple merge

diff --cc drivers/mtd/nand/sharpsl.c
Simple merge

diff --cc drivers/mtd/nand/sunxi_nand.c
Simple merge

diff --cc drivers/mtd/nand/tmio_nand.c
Simple merge

diff --cc drivers/mtd/nand/vf610_nfc.c
index b88a0c91b4557b309828026c31b04200fb550d44,8ba9b6de5fa617b41fbf3b2129977d5713849085..8037d4b48a056a1c929605705c8f39c2c4400f5b
--- 1/drivers/mtd/nand/vf610_nfc.c
--- 2/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@@ -31,9 -31,10 +31,9 @@@
  #include <linux/interrupt.h>
  #include <linux/io.h>
  #include <linux/mtd/mtd.h>
- #include <linux/mtd/nand.h>
+ #include <linux/mtd/rawnand.h>
  #include <linux/mtd/partitions.h>
  #include <linux/of_device.h>
 -#include <linux/pinctrl/consumer.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
  

diff --cc include/linux/mtd/rawnand.h
Simple merge

diff --cc include/linux/mtd/sharpsl.h
Simple merge