commit | d448dce3f4f4ad28c164e05b2696091bf5919fc9 | [log] [tgz] |
---|---|---|
author | Alex Shi <alex.shi@linaro.org> | Fri Mar 18 11:41:51 2016 +0800 |
committer | Alex Shi <alex.shi@linaro.org> | Fri Mar 18 11:41:51 2016 +0800 |
tree | ea67e279adedc950c3d4d8e98546b3823a2b3e93 | |
parent | 34e0913e457f8469667faf5fa600447aa93371cf [diff] | |
parent | dfbed80c63bb8d965067da3a6dbcc4682edcce0c [diff] |
Merge remote-tracking branch 'lts/linux-3.14.y' into linux-linaro-lsk-v3.14 Conflicts: Most of conflict happened on efivar_validate() change which introduced a new parameter to check efi guid. I added efi guid for this change sanity_check()/efivar_create() in drivers/firmware/efi/efivars.c and keep new efivar_validate() in drivers/firmware/efi/vars.c include/linux/efi.h