Merge tag 'nand/for-4.11' of github.com:linux-nand/linux

From Boris:

"""
This pull request contains minor fixes/improvements on existing drivers:
- sunxi: avoid busy-waiting for NAND events
- ifc: fix ECC handling on IFC v1.0
- OX820: add explicit dependency on ARCH_OXNAS in Kconfig
- core: add a new manufacture ID and fix a kernel-doc warning
- fsmc: kill pdata support
- lpc32xx_slc: remove unneeded NULL check
"""

Conflicts:
	include/linux/mtd/nand.h
[Brian: trivial conflict in the comment section]

diff --cc include/linux/mtd/nand.h
index 4e1b441c3a7ef27585c06679daa20929f7b5432c,f6017a1a35d682737a07feef07beaf69cccabbd6..9591e0fbe5bd76a1c47e2deb4292469e0a2cf8e6
--- 1/include/linux/mtd/nand.h
--- 2/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@@ -801,9 -801,7 +801,10 @@@ nand_get_sdr_timings(const struct nand_
   *                    supported, 0 otherwise.
   * @jedec_params:     [INTERN] holds the JEDEC parameter page when JEDEC is
   *                    supported, 0 otherwise.
 + * @max_bb_per_die:   [INTERN] the max number of bad blocks each die of a
 + *                    this nand device will encounter their life times.
 + * @blocks_per_die:   [INTERN] The number of PEBs in a die
+  * @data_interface:   [INTERN] NAND interface timing information
   * @read_retries:     [INTERN] the number of read retry modes supported
   * @onfi_set_features:        [REPLACEABLE] set the features for ONFI nand
   * @onfi_get_features:        [REPLACEABLE] get the features for ONFI nand