| commit | 4b6415f9f9ca6bc8e449a73d8be1055aed63fd3a | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 17 Feb 2018 18:06:13 +0000 (17 10:06 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 17 Feb 2018 18:06:13 +0000 (17 10:06 -0800) | ||
| tree | 524f2ecbc8829601ca3ef750e1f4d185e74b03ad | treesnapshot (tar.gz zip) |
| parent | ee78ad7848a72195e3683f9fdcc81f0b002fb2ed | commitdiff |
| parent | f23def8038611fa362de345c540107c78edaa085 | commitdiff |
Merge tag 'mtd/fixes-for-4.16-rc2' of git://git.infradead.org/linux-mtd
Pull mtd fixes from Boris Brezillon:
- add missing dependency to NAND_MARVELL Kconfig entry
- use the appropriate OOB layout in the VF610 driver
* tag 'mtd/fixes-for-4.16-rc2' of git://git.infradead.org/linux-mtd:
mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA
mtd: nand: vf610: set correct ooblayout
Pull mtd fixes from Boris Brezillon:
- add missing dependency to NAND_MARVELL Kconfig entry
- use the appropriate OOB layout in the VF610 driver
* tag 'mtd/fixes-for-4.16-rc2' of git://git.infradead.org/linux-mtd:
mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA
mtd: nand: vf610: set correct ooblayout