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

Merge branch 'fixes' into next 

Merge our fixes branch to bring in some changes that conflict with
upcoming next content.
parents 544f823e 2ea31e2e
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