projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b25046b 54ea17a)
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 patch | diff1 | diff2 | blob | history
include/linux/mtd/nand.h patch | diff1 | diff2 | blob | history

diff --cc drivers/mtd/chips/cfi_cmdset_0002.c
Simple merge
diff --cc include/linux/mtd/nand.h
Simple merge
John Crispins staging tree