[poky] [PATCH 4/6] documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed.

[scott.m.rifenbark at intel.com]

From: Scott Rifenbark <scott.m.rifenbark at intel.com>

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 at intel.com>
---
 documentation/kernel-manual/kernel-how-to.xml |    2 +-
 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 6b326b5..01a78e6 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'>
      > git checkout common_pc-standard
-     > git merge cav_ebt5800-standard
+     > git merge common_pc_64-standard
      # resolve any conflicts and commit them
      > cd .. ; echo linux/.git > .cvsignore
      > cvs import -m "initial import" linux MY_COMPANY start
-- 
1.7.1