Merging uefi-next/linaro-release into masterHEADlinaro-uefi-2014.01master

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/MdePkg/Include/Library/S3BootScriptLib.h b/MdePkg/Include/Library/S3BootScriptLib.h
index 0776812e6..1afb07c24 100644
--- a/MdePkg/Include/Library/S3BootScriptLib.h
+++ b/MdePkg/Include/Library/S3BootScriptLib.h
@@ -5,7 +5,7 @@
   be provided in the Framework version library instance, which means some of these 

   APIs cannot be used if the underlying firmware is Framework and not PI.

 

-  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions

@@ -281,7 +281,7 @@ S3BootScriptSaveStall (
   );

 

 /**

-  Adds a record for an execution stall on the processor into a specified boot script table.

+  Adds a record for dispatching specified arbitrary code into a specified boot script table.

 

   @param[in] EntryPoint   The entry point of the code to be dispatched.

   @param[in] Context      The argument to be passed into the EntryPoint of the code 

@@ -492,7 +492,7 @@ S3BootScriptSaveInformationAsciiString (
   for figuring out how to get the script to run on an S3 resume because the boot script 

   maintained by the lib will be destroyed.

  

-  @return the base address of the new copy of the boot script tble.   

+  @return the base address of the new copy of the boot script table.   

 

 **/

 UINT8*