Merge tag 'v3.8-rc6' into x86/urgent

Linux 3.8-rc6

Merged in order to add a documentation update versus new code in
upstream.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 5426e482db6e..77cf0090c0a3 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -949,7 +949,7 @@ void __init efi_enter_virtual_mode(void)
          *
          * Call EFI services through wrapper functions.
          */
-        efi.runtime_version = efi_systab.fw_revision;
+        efi.runtime_version = efi_systab.hdr.revision;
         efi.get_time = virt_efi_get_time;
         efi.set_time = virt_efi_set_time;
         efi.get_wakeup_time = virt_efi_get_wakeup_time;