From ef0b7446784cb7e09ae74d24d27e0264e9abf17d Mon Sep 17 00:00:00 2001 From: Egry Gabor Date: Mon, 26 Jun 2006 18:47:15 +0200 Subject: [PATCH] --- yaml --- r: 30632 b: refs/heads/master c: 48a1204c462985378e02b4c5129901f3dbc93f80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/Kconfig | 2 +- trunk/arch/i386/Kconfig.cpu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac7f82ae971f..e392173a2843 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc940c40c6473cb40178458e2c74aea6b45aac03 +refs/heads/master: 48a1204c462985378e02b4c5129901f3dbc93f80 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index 1596101cfaf8..e14b20783995 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -721,7 +721,7 @@ config KEXEC help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot - but it is indepedent of the system firmware. And like a reboot + but it is independent of the system firmware. And like a reboot you can start any kernel with it, not just Linux. The name comes from the similiarity to the exec system call. diff --git a/trunk/arch/i386/Kconfig.cpu b/trunk/arch/i386/Kconfig.cpu index eb130482ba18..21c9a4e71104 100644 --- a/trunk/arch/i386/Kconfig.cpu +++ b/trunk/arch/i386/Kconfig.cpu @@ -41,7 +41,7 @@ config M386 - "GeodeGX1" for Geode GX1 (Cyrix MediaGX). - "Geode GX/LX" For AMD Geode GX and LX processors. - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3. - - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above). + - "VIA C3-2" for VIA C3-2 "Nehemiah" (model 9 and above). If you don't know what to do, choose "386".