diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-03 00:57:03 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 10:36:33 +0100 |
| commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
| tree | 31894d9dc2c29f31234e479de520a50858cce54c /arch/arm/mach-s3c24xx/mach-rx1950.c | |
| parent | Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc (diff) | |
| parent | ARM: S3C24XX: Move s3c2443-clock.c to mach-s3c24xx (diff) | |
| download | linux-880bcd4a8363f24375027f9ded4670960dcfa70a.tar.xz linux-880bcd4a8363f24375027f9ded4670960dcfa70a.zip | |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx1950.c (renamed from arch/arm/mach-s3c2440/mach-rx1950.c) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index 80077f6472ee..80077f6472ee 100644 --- a/arch/arm/mach-s3c2440/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c |