tree 31894d9dc2c29f31234e479de520a50858cce54c
parent a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13
parent 8c3d7c30c306d83ff9c303f42307765a5a7bc254
author Kukjin Kim <kgene.kim@samsung.com> 1330732623 +0900
committer Kukjin Kim <kgene.kim@samsung.com> 1331112993 -0800

Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx

Conflicts:
	arch/arm/mach-s3c24xx/include/mach/system.h