Merge tag 'v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorBoris Brezillon <boris.brezillon@bootlin.com>
Wed, 4 Apr 2018 20:13:35 +0000 (22:13 +0200)
committerBoris Brezillon <boris.brezillon@bootlin.com>
Wed, 4 Apr 2018 20:13:35 +0000 (22:13 +0200)
commitfe5f31a8010a0cb13e72cfb72905fefa2a41730c
tree324d237e47092cc66b13c7421dbda6ea6961c6b4
parenta88b5f38338db9cf2b8868e3645c30da655ac139
parent91ab883eb21325ad80f3473633f794c78ac87f51
Merge tag 'v4.16-rc2' of git://git./linux/kernel/git/torvalds/linux into mtd/next

Backmerge v4.16-rc2 into mtd/next to resolve a conflict between Linus'
master branch and nand/for-4.17.
MAINTAINERS
drivers/mtd/nand/raw/Kconfig
drivers/mtd/nand/raw/vf610_nfc.c