Merge commit 'f3cae355a962784101478504ef7f6a389ad62979' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 29 Apr 2014 23:36:34 +0000 (09:36 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 29 Apr 2014 23:36:34 +0000 (09:36 +1000)
Merge Linus tree to get "cpufreq, powernv: Fix build failure on UP"
to avoid build breakages in some of my test configs.


Trivial merge