| commit | 6c8bb087540a7b6b193d92e01dbc6dff518a524a | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Tue, 23 Aug 2011 12:11:40 +0000 (23 09:11 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Tue, 23 Aug 2011 12:11:40 +0000 (23 09:11 -0300) | ||
| tree | 66210a08e503aabc17b945352ba0fbe876e3dc14 | treesnapshot (tar.gz zip) |
| parent | 44755ea36fee3f0b1093ef27404def8857602274 | commitdiff |
| parent | d67c3f2cd92aed2247bfa8a9da61a902b7b2ff09 | commitdiff |
Merge commit 'd67c3f2cd92aed2247bfa8a9da61a902b7b2ff09' into upstream-merge
* commit 'd67c3f2cd92aed2247bfa8a9da61a902b7b2ff09':
seabios: update to master
Conflicts:
roms/seabios
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'd67c3f2cd92aed2247bfa8a9da61a902b7b2ff09':
seabios: update to master
Conflicts:
roms/seabios
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>