diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:34:39 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:34:39 -0700 |
| commit | a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5 (patch) | |
| tree | 653ab2d3049d1231e7e462155564a6953d0a720a /arch/arm/mach-exynos/include | |
| parent | 8b1a13b02812b60b88920801363920956691feb3 (diff) | |
| parent | e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad (diff) | |
Merge branch 'next/boards' into HEAD
Conflicts:
arch/arm/mach-shmobile/board-armadillo800eva.c
Diffstat (limited to 'arch/arm/mach-exynos/include')
0 files changed, 0 insertions, 0 deletions