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

Merge branch 'misc' into devel 

Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/kernel/Makefile
	arch/arm/kernel/smp.c
parents 58daf18c 4ec3eb13
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