Skip to content
Commit 1e7342e7 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'jwb/next' into next 

Conflicts:
	arch/powerpc/platforms/40x/ppc40x_simple.c
parents 78c5c68a 228d5505
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment