]> git.baikalelectronics.ru Git - kernel.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)
commitc3b24ed54973e17b0e7f39192252eba346869cba
treee91b17f2e0820e506a4a6c91afc921a3cea4cd63
parent7fc8f611c8a1e3f07d84424344b4678408fa5d2b
parent27ce8803d2df7610b91ccadd8197b24d0a1eca4f
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