diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 10:13:09 +0200 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 10:13:09 +0200 |
commit | 2520123382e97271e932377c83bca010c265be55 (patch) | |
tree | 1403c6c4ea400be832322cd84acee93cd49076e7 /arch/arm/mach-exynos4/mach-smdkv310.c | |
parent | ARM: EXYNOS4: Add support SMDK4212 Board (diff) | |
parent | ARM: EXYNOS4: Add support for ORIGEN board (diff) | |
download | linux-2520123382e97271e932377c83bca010c265be55.tar.xz linux-2520123382e97271e932377c83bca010c265be55.zip |
Merge branch 'next-samsung-board-v3.1' into next-samsung-board
Conflicts:
arch/arm/mach-exynos4/Kconfig
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions