Commit 3f1f4311 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge branch 'merge' into next 

Merge stuff that already went into Linus via "merge" which
are pre-reqs for subsequent patches
parents 5935ff43 28e61cc4
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