]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'v3.16-next/cleanup-samsung' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 19 May 2014 16:31:26 +0000 (01:31 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 19 May 2014 16:31:26 +0000 (01:31 +0900)
commitc563924845f0b00b2c3d17d9f34eb3f0b54aad42
tree898597d40abf15543c8049cd195d91a8e6ebaf88
parent70f91f93c441f28bed29b7bf69cee8114cb86921
parent2b07f4085479fb9feac86abb2392f3a32b2d4bed
Merge branch 'v3.16-next/cleanup-samsung' into for-next

Conflicts:
arch/arm/mach-s3c24xx/Kconfig
arch/arm/Kconfig.debug
arch/arm/mach-s3c24xx/Kconfig