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)
commit5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3
tree090c7c069bc6c0f2b368ed8d0af861c275525411
parentb25046b1e5e3f1423434da77ccc859f2f779d1ce
parent54ea17a597b00e46b3720e75dd7595cd5dfa5670
Merge l2-mtd/next into l2-mtd/master
drivers/mtd/chips/cfi_cmdset_0002.c
include/linux/mtd/nand.h