From: Brian Norris <computersforpeace@gmail.com>
Date: Mon, 18 May 2015 17:50:43 +0000 (-0700)
Subject: Merge tag 'v4.1-rc4' into MTD's -next
X-Git-Tag: firefly_0821_release~176^2~766^2~249
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v4.1-rc4' into MTD's -next
---

2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49