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

Merge branches 'fixes' and 'misc' into for-next 

Conflicts:
	arch/arm/kernel/iwmmxt.S
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c
parents 6bf755db 3bb70de6
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment