Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Showing
with 497 additions and 23 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment