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

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop 

Conflicts:
	MAINTAINERS
parents 610ea6c6 f00f510a
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