arch/arm/mach-shmobile/board-marzen.c · a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5 · Kirill Smelkov / linux · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Merge branch 'next/boards' into HEAD · a8e1ceb7
Olof Johansson authored Oct 01, 2012
```
Conflicts:
	arch/arm/mach-shmobile/board-armadillo800eva.c
```
a8e1ceb7

board-marzen.c 4.79 KB