| commit | fe5f31a8010a0cb13e72cfb72905fefa2a41730c | [log] [tgz] |
|---|---|---|
| author | Boris Brezillon <boris.brezillon@bootlin.com> | Wed Apr 04 22:13:35 2018 +0200 |
| committer | Boris Brezillon <boris.brezillon@bootlin.com> | Wed Apr 04 22:13:35 2018 +0200 |
| tree | 324d237e47092cc66b13c7421dbda6ea6961c6b4 | |
| parent | a88b5f38338db9cf2b8868e3645c30da655ac139 [diff] | |
| parent | 91ab883eb21325ad80f3473633f794c78ac87f51 [diff] |
Merge tag 'v4.16-rc2' of git://git.kernel.org/pub/scm/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.