diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-09 05:51:43 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-15 05:54:38 +0900 |
| commit | 34c453ce16633539a94a2e876faeb731ac1be899 (patch) | |
| tree | cbd8013079b316cc796044f7cb28d9b5a907ade5 /arch/arm/mach-s3c24xx/gta02.h | |
| 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>
Diffstat (limited to 'arch/arm/mach-s3c24xx/gta02.h')
0 files changed, 0 insertions, 0 deletions