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

Merge branch 'hotplug' into devel 

Conflicts:
	arch/arm/kernel/head-common.S
parents 23beab76 865a4fae
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