| commit | 34c453ce16633539a94a2e876faeb731ac1be899 | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Fri May 09 05:51:43 2014 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Thu May 15 05:54:38 2014 +0900 |
| tree | cbd8013079b316cc796044f7cb28d9b5a907ade5 | |
| parent | 2916f9a2c6d9200b4c840a613cd1fa1dad04240f [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>