]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'v3.7-for-florian' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 11 Aug 2012 03:41:47 +0000 (12:41 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 11 Aug 2012 03:41:47 +0000 (12:41 +0900)
1  2 
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-smdkv310.c

Simple merge
Simple merge