]> git.proxmox.com Git - efi-boot-shim.git/commit
Merge branch 'mok' into netboot
authorMatthew Garrett <mjg@redhat.com>
Thu, 1 Nov 2012 19:29:23 +0000 (15:29 -0400)
committerMatthew Garrett <mjg@redhat.com>
Thu, 1 Nov 2012 19:29:23 +0000 (15:29 -0400)
commit4ad234f17580123bedac801735a41fdea863b55a
tree5511362a245020f811d6c59d39d2e54d17bd3a21
parent28a3e57c9acafe382452ad6297464dd403fabf03
parent20f6cde6799c899a893b12d85bdf3b3c1444ef2e
Merge branch 'mok' into netboot

Conflicts:
shim.c
shim.c