diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 16:47:48 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 16:47:48 -0400 |
| commit | 586893ebc42943008010b4c210cfc9167df615e5 (patch) | |
| tree | eec3179235978fba9ca6bfae0799d97c8532ee15 /Documentation | |
| parent | 014322dac6ae0048c928c6ca2faf0d53194f9d15 (diff) | |
| parent | bd6356bdafc853201168f718f0059fbe11191461 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/arm/Samsung/Overview.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/arm/Samsung/Overview.txt b/Documentation/arm/Samsung/Overview.txt index c3094ea51aa7..658abb258cef 100644 --- a/Documentation/arm/Samsung/Overview.txt +++ b/Documentation/arm/Samsung/Overview.txt | |||
| @@ -14,7 +14,6 @@ Introduction | |||
| 14 | - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list | 14 | - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list |
| 15 | - S3C64XX: S3C6400 and S3C6410 | 15 | - S3C64XX: S3C6400 and S3C6410 |
| 16 | - S5P6440 | 16 | - S5P6440 |
| 17 | - S5P6442 | ||
| 18 | - S5PC100 | 17 | - S5PC100 |
| 19 | - S5PC110 / S5PV210 | 18 | - S5PC110 / S5PV210 |
| 20 | 19 | ||
| @@ -36,7 +35,6 @@ Configuration | |||
| 36 | unifying all the SoCs into one kernel. | 35 | unifying all the SoCs into one kernel. |
| 37 | 36 | ||
| 38 | s5p6440_defconfig - S5P6440 specific default configuration | 37 | s5p6440_defconfig - S5P6440 specific default configuration |
| 39 | s5p6442_defconfig - S5P6442 specific default configuration | ||
| 40 | s5pc100_defconfig - S5PC100 specific default configuration | 38 | s5pc100_defconfig - S5PC100 specific default configuration |
| 41 | s5pc110_defconfig - S5PC110 specific default configuration | 39 | s5pc110_defconfig - S5PC110 specific default configuration |
| 42 | s5pv210_defconfig - S5PV210 specific default configuration | 40 | s5pv210_defconfig - S5PV210 specific default configuration |