| commit | 87a4f17d2f778fd71fc60ac8fa60f77701b15690 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 7 Mar 2012 20:39:31 +0000 (7 17:39 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 7 Mar 2012 20:39:31 +0000 (7 17:39 -0300) | ||
| tree | dd2bd3981bac9286d629962c3a861c1bf10bc6d9 | treesnapshot (tar.gz zip) |
| parent | 49adbab6a29ccb9f2abb31d5d8ab4cb9818ed258 | commitdiff |
| parent | 2a2af967b0bc601c9b450c72b95104e67222e5b2 | commitdiff |
Merge commit '2a2af967b0bc601c9b450c72b95104e67222e5b2' into upstream-merge
* commit '2a2af967b0bc601c9b450c72b95104e67222e5b2':
kvmvapic: Add option ROM
Conflicts:
.gitignore
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '2a2af967b0bc601c9b450c72b95104e67222e5b2':
kvmvapic: Add option ROM
Conflicts:
.gitignore
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| .gitignore | diff1 | diff2 | blobhistory |
| Makefile | diff1 | diff2 | blobhistory |
| pc-bios/optionrom/Makefile | diff1 | diff2 | blobhistory |