Skip to content
Commit 8a3e1c67 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'merge' 

Conflicts:

	arch/powerpc/sysdev/fsl_soc.c
parents e026892c 60d5019b
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