From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 11 Jul 2014 05:38:12 +0000 (+1000)
Subject: Merge branch 'merge' into next
X-Git-Tag: firefly_0821_release~176^2~3459^2~79
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5b97259220cae53b174817aab6ab1ff1b616aaf3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'merge' into next
---

5b97259220cae53b174817aab6ab1ff1b616aaf3