Skip to content
Commit 7c202575 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'fixes' into next 

Merge our fixes branch, primarily to bring in the powernv CPU hotplug
warning fix.
parents e44ff9ea 7d647505
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment