review.tizen.org Git - platform/kernel/linux-rpi.git/commit

author	Boris Brezillon <boris.brezillon@free-electrons.com>
	Mon, 28 Aug 2017 16:04:15 +0000 (18:04 +0200)
committer	Boris Brezillon <boris.brezillon@free-electrons.com>
	Mon, 28 Aug 2017 16:04:15 +0000 (18:04 +0200)
commit	5ffa70b2a38befadb920b85fe87f5da2b4cff623
tree	411b1d357731db5e2611f0ca67082a8c909b7d9d	tree \| snapshot
parent	75864b301c91bf41ec2fb49ce4efb62fcb48b954	commit \| diff
parent	cc4a41fe5541a73019a864883297bd5043aa6d98	commit \| diff

Merge tag 'v4.13-rc7' into mtd/next

Merge v4.13-rc7 back to resolve merge conflicts in
drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.