Skip to content
Commit d5cd8605 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'at91/cleanup' into next/dt 



Conflicts:
	arch/arm/boot/dts/at91sam9rl.dtsi

Needed as a dependency for the at91/dt2 branch

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 21c27cab 138e8f1c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment