diff options
author | Mark Brown <broonie@kernel.org> | 2018-12-20 17:01:30 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-12-20 17:01:30 +0100 |
commit | 74ff666bd7ba2da563f99f2a8af7bf9f20008bc9 (patch) | |
tree | 09b815bf09932e583082a633c874f091791d6838 /drivers/mtd/spi-nor | |
parent | Merge branch 'spi-4.21' into spi-next (diff) | |
parent | spi: spi-mem: Add a new API to support direct mapping (diff) | |
parent | mtd: atmel-quadspi: disallow building on ebsa110 (diff) | |
download | linux-74ff666bd7ba2da563f99f2a8af7bf9f20008bc9.tar.xz linux-74ff666bd7ba2da563f99f2a8af7bf9f20008bc9.zip |
Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next