diff options
| author | Brian Norris | 2016-01-06 01:04:40 +0100 |
|---|---|---|
| committer | Brian Norris | 2016-01-06 01:05:56 +0100 |
| commit | e576330033936d94a00068760a5744e27ce51a32 (patch) | |
| tree | e91b17f2e0820e506a4a6c91afc921a3cea4cd63 /drivers/nvmem/mxs-ocotp.c | |
| parent | mtd: nand: fix for drop unnecessary partition parser data (diff) | |
| parent | mtd: spi-nor: fix stm_is_locked_sr() parameters (diff) | |
| download | kernel-qcow2-linux-e576330033936d94a00068760a5744e27ce51a32.tar.gz kernel-qcow2-linux-e576330033936d94a00068760a5744e27ce51a32.tar.xz kernel-qcow2-linux-e576330033936d94a00068760a5744e27ce51a32.zip | |
mtd: merge MTD development from v4.4 into for-v4.5 development
Small conflict between some bugfixes for 4.4 and some refactoring for
4.5.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/nvmem/mxs-ocotp.c')
0 files changed, 0 insertions, 0 deletions