]> git.proxmox.com Git - efi-boot-shim.git/commitdiff
Merge branch 'mok' of github.com:mjg59/shim into mok
authorMatthew Garrett <mjg@redhat.com>
Tue, 30 Oct 2012 19:59:40 +0000 (15:59 -0400)
committerMatthew Garrett <mjg@redhat.com>
Tue, 30 Oct 2012 19:59:40 +0000 (15:59 -0400)
1  2 
shim.c

diff --cc shim.c
Simple merge