Commit 25029915 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'fixes' into for-linus

Conflicts:

	arch/arm/mach-versatile/core.c
parents 7e69a8c4 a9ff8f64
Supports Markdown
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