git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a88b5f3 91ab883)

author	Boris Brezillon <boris.brezillon@bootlin.com>
	Wed, 4 Apr 2018 20:13:35 +0000 (22:13 +0200)
committer	Boris Brezillon <boris.brezillon@bootlin.com>
	Wed, 4 Apr 2018 20:13:35 +0000 (22:13 +0200)
commit	fe5f31a8010a0cb13e72cfb72905fefa2a41730c
tree	324d237e47092cc66b13c7421dbda6ea6961c6b4	tree \| snapshot
parent	a88b5f38338db9cf2b8868e3645c30da655ac139	commit \| diff
parent	91ab883eb21325ad80f3473633f794c78ac87f51	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/raw/Kconfig	diff1 \|	\|	blob \| history
drivers/mtd/nand/raw/vf610_nfc.c	diff1 \|	\|	blob \| history

John Crispins staging tree