From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 29 Apr 2014 23:36:34 +0000 (+1000)
Subject: Merge commit 'f3cae355a962784101478504ef7f6a389ad62979' into next
X-Git-Tag: firefly_0821_release~176^2~3789^2~49
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=48ce3b7cc66b31cd8ae1b8155a82426308f71491;p=firefly-linux-kernel-4.4.55.git

Merge commit 'f3cae355a962784101478504ef7f6a389ad62979' into next

Merge Linus tree to get "cpufreq, powernv: Fix build failure on UP"
to avoid build breakages in some of my test configs.
---

48ce3b7cc66b31cd8ae1b8155a82426308f71491