]> 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)
commit821eca49e9115aa141f18cde812f5dfef32f4625
tree5511362a245020f811d6c59d39d2e54d17bd3a21
parent5c9470f288f3c93c449233ec740edee317e3084b
parent0aee67a800852934781cddcad7101edb057d70a3
Merge branch 'mok' into netboot

Conflicts:
shim.c
shim.c