]> xenbits.xensource.com Git - seabios.git/commit
projects / seabios.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a4e2b9a) | patch
Fix merge of a4e2b9adbba95c2d783761e84444bbb3c8d6107b.
authorKevin O'Connor <kevin@koconnor.net>
Fri, 20 Jul 2012 06:42:08 +0000 (02:42 -0400)
committerKevin O'Connor <kevin@koconnor.net>
Fri, 20 Jul 2012 06:42:08 +0000 (02:42 -0400)
commitafdeda03e078a9c6f586479716f911c40f3511b7
tree4604ddb3cabcc1ee984af6111271ff77f41d196etree
parenta4e2b9adbba95c2d783761e84444bbb3c8d6107bcommit | diff
Fix merge of a4e2b9adbba95c2d783761e84444bbb3c8d6107b.

The manual merge of a4e2b9ad that I did resulted in previous commits
(c7be281b and 20fcf9b) being undone.  Fix that up.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
src/acpi.c diff | blob | blame | history
Xen SeaBIOS (all branches potentially rebasing)