diff options
author | Brian Norris <computersforpeace@gmail.com> | 2016-01-06 00:04:40 (GMT) |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2016-01-06 00:05:56 (GMT) |
commit | e576330033936d94a00068760a5744e27ce51a32 (patch) | |
tree | e91b17f2e0820e506a4a6c91afc921a3cea4cd63 /Kconfig | |
parent | 887e9d3a1f3e93a1c64294649c0dd301035a7892 (diff) | |
parent | a32d5b726ff8cf32bf491522b0ac8ae2545a063e (diff) | |
download | linux-e576330033936d94a00068760a5744e27ce51a32.tar.xz |
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 'Kconfig')
0 files changed, 0 insertions, 0 deletions