]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
mtd: merge MTD development from v4.4 into for-v4.5 development
authorBrian Norris <computersforpeace@gmail.com>
Wed, 6 Jan 2016 00:04:40 +0000 (16:04 -0800)
committerBrian Norris <computersforpeace@gmail.com>
Wed, 6 Jan 2016 00:05:56 +0000 (16:05 -0800)
commite576330033936d94a00068760a5744e27ce51a32
treee91b17f2e0820e506a4a6c91afc921a3cea4cd63
parent887e9d3a1f3e93a1c64294649c0dd301035a7892
parenta32d5b726ff8cf32bf491522b0ac8ae2545a063e
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>
drivers/mtd/mtdcore.c
drivers/mtd/spi-nor/spi-nor.c
include/linux/mtd/spi-nor.h