diff --git a/[refs] b/[refs]
index 7d1270919716..9d477baa64be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0910b444bcd7ea7f437a3ff48e0e3d2495ead22e
+refs/heads/master: eed66cfcbbea851c97e287440d940286fce3f829
diff --git a/trunk/include/asm-ia64/sal.h b/trunk/include/asm-ia64/sal.h
index 29df88bdd2bc..313cad0628d0 100644
--- a/trunk/include/asm-ia64/sal.h
+++ b/trunk/include/asm-ia64/sal.h
@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp {
 typedef struct sal_log_record_header {
 	u64 id;				/* Unique monotonically increasing ID */
 	sal_log_revision_t revision;	/* Major and Minor revision of header */
-	u16 severity;			/* Error Severity */
+	u8 severity;			/* Error Severity */
+	u8 validation_bits;		/* 0: platform_guid, 1: !timestamp */
 	u32 len;			/* Length of this error log in bytes */
 	sal_log_timestamp_t timestamp;	/* Timestamp */
 	efi_guid_t platform_guid;	/* Unique OEM Platform ID */
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index be74adb389ea..ea097e0a9c02 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -206,7 +206,7 @@ config HOTPLUG
 	  outside the kernel tree does. Such modules require Y here.
 
 config KOBJECT_UEVENT
-	bool "Kernel Userspace Events" if EMBEDDED
+	bool "Kernel Userspace Events"
 	depends on NET
 	default y
 	help
@@ -339,7 +339,7 @@ config EPOLL
 	  support for epoll family of system calls.
 
 config CC_OPTIMIZE_FOR_SIZE
-	bool "Optimize for size"
+	bool "Optimize for size" if EMBEDDED
 	default y if ARM || H8300
 	help
 	  Enabling this option will pass "-Os" instead of "-O2" to gcc