Permalink
Browse files

Merge branch 'mok' into netboot

Conflicts:
	shim.c
  • Loading branch information...
2 parents 5c9470f + 0aee67a commit 821eca49e9115aa141f18cde812f5dfef32f4625 Matthew Garrett committed Nov 1, 2012
Showing with 151 additions and 5 deletions.
  1. +151 −5 shim.c
Oops, something went wrong.

0 comments on commit 821eca4

Please sign in to comment.