From: Ingo Molnar Date: Tue, 16 Feb 2016 15:46:40 +0000 (+0100) Subject: Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming... X-Git-Tag: MMI-PSA29.97-13-9~8481^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=02a5f765c961ea778e30a8356f32528e65f34942;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'efi-urgent' of git://git./linux/kernel/git/mfleming/efi into x86/urgent Pull EFI bug fixes from Matt Fleming: * Fix bugs in our code that converts ucs2 strings to utf8 where we unintentionally drop bits from the original string (Jason Andryuk) * Add the efi-pstore variables to the variable whitelist so that users can continue to delete them via efivarfs without needing to manipulate the immutable flag (Matt Fleming) Signed-off-by: Ingo Molnar --- 02a5f765c961ea778e30a8356f32528e65f34942