From: Brian Norris Date: Tue, 21 Oct 2014 20:46:59 +0000 (-0700) Subject: MTD: merge 3.18 development into -next development X-Git-Tag: v3.19-rc1~49^2~64 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=577267f39cc10981a36cc8d3ee274806256a6232;p=users%2Fjedix%2Flinux-maple.git MTD: merge 3.18 development into -next development To keep the two paths in sync --- 577267f39cc10981a36cc8d3ee274806256a6232