Skip to content
Commit a8e1ceb7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/boards' into HEAD 

Conflicts:
	arch/arm/mach-shmobile/board-armadillo800eva.c
parents 8b1a13b0 e6ca4ae8
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