aboutsummaryrefslogtreecommitdiffstats
path: root/documentation/kernel-manual
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2011-02-08 13:48:13 -0600
committerScott Rifenbark <scott.m.rifenbark@intel.com>2011-02-14 17:07:35 -0600
commit09e2aac993621fb1eaca8d1f7d150139472f7dae (patch)
tree939f27a11d5ca0fe27534cc0aff38f6203170f9f /documentation/kernel-manual
parent2a8c4a32be789e4101b24b0d9ea6d8116968fc72 (diff)
downloadpoky-09e2aac993621fb1eaca8d1f7d150139472f7dae.tar.gz
poky-09e2aac993621fb1eaca8d1f7d150139472f7dae.tar.bz2
poky-09e2aac993621fb1eaca8d1f7d150139472f7dae.zip
documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed.
The example used to show how to condense and merge two BSPs into a second SCM used a non-existant machine (cav_ebt5800-standard). I replaced this machine with 'common_pc_64-standard, which is a real machine. Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Diffstat (limited to 'documentation/kernel-manual')
-rw-r--r--documentation/kernel-manual/kernel-how-to.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index 6b326b5561..01a78e685c 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -882,7 +882,7 @@ repository.
The following commands illustrate how you can condense and merge two BSPs into a second SCM:
<literallayout class='monospaced'>
&gt; git checkout common_pc-standard
- &gt; git merge cav_ebt5800-standard
+ &gt; git merge common_pc_64-standard
# resolve any conflicts and commit them
&gt; cd .. ; echo linux/.git &gt; .cvsignore
&gt; cvs import -m "initial import" linux MY_COMPANY start