Merge branch 'master' into mok-prototype3

Conflicts:
	shim.c

diff --cc shim.c
index 71c80ce76f1bf7dc16a5e4cb7fac2423a2a930ca,598250992f6137bdbc8f054c784b1624e1b64129..d05a69a5b28cc485bee77aa6deb3b6d342edee46
--- 1/shim.c
--- 2/shim.c
+++ b/shim.c
@@@ -607,7 -605,8 +606,8 @@@ static EFI_STATUS read_header(void *dat
  /*
   * Once the image has been loaded it needs to be validated and relocated
   */
- static EFI_STATUS handle_image (void *data, int datasize, EFI_LOADED_IMAGE *li)
 -static EFI_STATUS handle_grub (void *data, unsigned int datasize,
 -                             EFI_LOADED_IMAGE *li)
++static EFI_STATUS handle_image (void *data, unsigned int datasize,
++                              EFI_LOADED_IMAGE *li)
  {
        EFI_STATUS efi_status;
        char *buffer;