Repair merge errors. Thanks Pyun YongHyeon, Sorry Henning :)
Repair merge errors. Thanks Pyun YongHyeon, Sorry Henning :)

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars