]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'v3.16-next/cleanup-samsung' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 16 May 2014 23:51:40 +0000 (08:51 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 16 May 2014 23:51:40 +0000 (08:51 +0900)
commit493388f563bbb5f9d6735c348a7b710e23f63479
tree371cc20cdd25e5dbdac20dad2475a347c54ec109
parentc131af70737dc81e59b34a4437d123c1df67d2b0
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