Merge tag 'efi-urgent' into x86/urgent
authorH. Peter Anvin <hpa@zytor.com>
Fri, 27 Jun 2014 14:55:24 +0000 (07:55 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 27 Jun 2014 14:55:24 +0000 (07:55 -0700)
commitba3f35c7ce443c829bd806202ce29fa36d322ff3
treee25416124cfaf059d4e2f38c29f4630a2fc58571
parent6a89d71078dad9b1c49ccdf1ffa656fbe36ccd1e
parent783ee43118dc773bc8b0342c5b230e017d5a04d0
Merge tag 'efi-urgent' into x86/urgent

 * Fix a few compiler warnings (one being a real bug) in the arm64 EFI
   code that lots of people are running into and reporting - Catalin Marinas

 * Use a cast to avoid a 32-bit overflow issue when generating pstore
   filenames - Andrzej Zaborowski

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