Skip to content
Commit a0f0dd57 authored by Russell King's avatar Russell King
Browse files

Merge branch 'fixes' into for-linus 

Conflicts:
	arch/arm/kernel/smp.c
parents 2a552d5e 846a1368
Expand all 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