| commit | 880bcd4a8363f24375027f9ded4670960dcfa70a | |
| author | Kukjin Kim <kgene.kim@samsung.com> | |
| Fri, 2 Mar 2012 23:57:03 +0000 (3 08:57 +0900) | ||
| committer | Kukjin Kim <kgene.kim@samsung.com> | |
| Wed, 7 Mar 2012 09:36:33 +0000 (7 01:36 -0800) | ||
| tree | 31894d9dc2c29f31234e479de520a50858cce54c | treesnapshot (tar.gz zip) |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 | commitdiff |
| parent | 8c3d7c30c306d83ff9c303f42307765a5a7bc254 | commitdiff |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h