Merge tag 'nand/for-4.11' of github.com:linux-nand/linux
authorBrian Norris <computersforpeace@gmail.com>
Wed, 8 Feb 2017 23:00:24 +0000 (15:00 -0800)
committerBrian Norris <computersforpeace@gmail.com>
Wed, 8 Feb 2017 23:00:24 +0000 (15:00 -0800)
commit9c8d7ff32a0aa001ac8506180e1662ecdf927f32
tree65f44bde4c200c7485479d59df550815371c0ab0
parent5d708ecc6c7718c22bcacabff0fbb32ecd19ad6b
parenta4077ce5871304f8a78f80b74b18b6052a410f1a
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]
include/linux/mtd/nand.h