Merge l2-mtd/next into l2-mtd/master
authorBrian Norris <computersforpeace@gmail.com>
Tue, 19 Aug 2014 18:57:23 +0000 (11:57 -0700)
committerBrian Norris <computersforpeace@gmail.com>
Tue, 19 Aug 2014 18:57:23 +0000 (11:57 -0700)
1  2 
drivers/mtd/chips/cfi_cmdset_0002.c
include/linux/mtd/nand.h

Simple merge
Simple merge