From: Linus Torvalds Date: Fri, 3 Dec 2010 17:20:21 +0000 (-0800) Subject: Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 X-Git-Tag: firefly_0821_release~7613^2~3291 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=88063dd69b124721e18a59535d4f35266fcb867f;p=firefly-linux-kernel-4.4.55.git Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 * 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: fix corrupted PEB detection for NOR flash --- 88063dd69b124721e18a59535d4f35266fcb867f