Learn more about cloning repositories
You have read-only access
Merge branch 'next/boards' into HEAD Conflicts: arch/arm/mach-shmobile/board-armadillo800eva.c