From: Brian Norris <computersforpeace@gmail.com>
Date: Tue, 19 Aug 2014 18:57:23 +0000 (-0700)
Subject: Merge l2-mtd/next into l2-mtd/master
X-Git-Tag: v3.18-rc1~25^2~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3;p=users%2Fjedix%2Flinux-maple.git

Merge l2-mtd/next into l2-mtd/master
---

5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3