diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-03 03:57:03 +0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 13:36:33 +0400 |
| commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
| tree | 31894d9dc2c29f31234e479de520a50858cce54c /arch/arm/include/asm/hwcap.h | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 8c3d7c30c306d83ff9c303f42307765a5a7bc254 (diff) | |
| download | linux-880bcd4a8363f24375027f9ded4670960dcfa70a.tar.xz | |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to 'arch/arm/include/asm/hwcap.h')
0 files changed, 0 insertions, 0 deletions