Skip to content
Commit 7d83f8fc authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'master' of git://git.marvell.com/orion into devel 

Conflicts:

	arch/arm/mach-mx1/devices.c
parents be093beb 569106c7
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