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

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

2 files changed, 3 insertions, 1 deletions

diff --git a/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h b/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
index 16384f831..b3016eee5 100644
--- a/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
+++ b/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
@@ -85,7 +85,7 @@ InitializeCpuInterruptHandlers (
                                 previously installed.

   @retval EFI_UNSUPPORTED       The interrupt specified by InterruptType is not supported,

                                 or this function is not supported.

-*/

+**/

 EFI_STATUS

 EFIAPI

 RegisterCpuInterruptHandler (

diff --git a/MdeModulePkg/Include/Protocol/FormBrowserEx.h b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
index afeb7c0c0..3bb64c6ff 100644
--- a/MdeModulePkg/Include/Protocol/FormBrowserEx.h
+++ b/MdeModulePkg/Include/Protocol/FormBrowserEx.h
@@ -27,6 +27,7 @@ typedef struct _EFI_FORM_BROWSER_EXTENSION_PROTOCOL   EFI_FORM_BROWSER_EXTENSION
 #define BROWSER_NO_CHANGES          0

 #define BROWSER_SAVE_CHANGES        1

 #define BROWSER_DISCARD_CHANGES     2

+#define BROWSER_KEEP_CURRENT        3

 

 //

 // Browser actions. They can be cominbed together. 

@@ -126,6 +127,7 @@ VOID
   @retval BROWSER_NO_CHANGES       No browser data is changed.

   @retval BROWSER_SAVE_CHANGES     The changed browser data is saved.

   @retval BROWSER_DISCARD_CHANGES  The changed browser data is discard.

+  @retval BROWSER_KEEP_CURRENT     Browser keep current changes.

 

 **/

 typedef