]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'v3.4-samsung-fixes-2' and 'v3.4-samsung-fixes-3' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 14 Apr 2012 15:24:20 +0000 (08:24 -0700)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 14 Apr 2012 15:24:20 +0000 (08:24 -0700)
1  2 
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-universal_c210.c

Simple merge