git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	Kukjin Kim <kgene.kim@samsung.com>
	Thu, 8 May 2014 20:51:43 +0000 (05:51 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Wed, 14 May 2014 20:54:38 +0000 (05:54 +0900)
commit	34c453ce16633539a94a2e876faeb731ac1be899
tree	cbd8013079b316cc796044f7cb28d9b5a907ade5	tree \| snapshot (tar.gz zip)
parent	2916f9a2c6d9200b4c840a613cd1fa1dad04240f	commit \| diff

ARM: S3C24XX: fix merge conflict

Missed some changes during re-sorting this branch.
So fixed it.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>