diff options
| author | Matthew Garrett <mjg@redhat.com> | 2012-11-01 15:29:23 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2012-11-01 15:29:23 -0400 |
| commit | 821eca49e9115aa141f18cde812f5dfef32f4625 (patch) | |
| tree | 5511362a245020f811d6c59d39d2e54d17bd3a21 /netboot.c | |
| parent | 5c9470f288f3c93c449233ec740edee317e3084b (diff) | |
| parent | 0aee67a800852934781cddcad7101edb057d70a3 (diff) | |
| download | efi-boot-shim-821eca49e9115aa141f18cde812f5dfef32f4625.tar.gz efi-boot-shim-821eca49e9115aa141f18cde812f5dfef32f4625.zip | |
Merge branch 'mok' into netboot
Conflicts:
shim.c
Diffstat (limited to 'netboot.c')
0 files changed, 0 insertions, 0 deletions