Skip to content
Commit 57225b76 authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base 

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c
parents 62aa2b53 dcf81c1a
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