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)
commit48ce3b7cc66b31cd8ae1b8155a82426308f71491
treefc7eb8e35803f5360e13968e19bd080acb99bc7b
parent7f06f21d40a638e1ca759ceda0f21cd81082607e
parentf3cae355a962784101478504ef7f6a389ad62979
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.