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

Merge commit 'kumar/next' into next 

Conflicts:
	arch/powerpc/sysdev/fsl_msi.c
parents 3d00d4ff 48936a08
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