| commit | f8fc7046c05c22047e88d0d8e0bf0bc8eb054373 | |
| author | Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe> | |
| Tue, 6 May 2008 08:58:53 +0000 (6 03:58 -0500) | ||
| committer | Avi Kivity <avi@qumranet.com> | |
| Tue, 6 May 2008 10:47:19 +0000 (6 13:47 +0300) | ||
| tree | 85d7de305501222499e5db535ae594c57e7113a7 | treesnapshot (tar.gz zip) |
| parent | 58bd31368fabe8036b9c5baccc3a9ed57f4c3f90 | commitdiff |
kvm: janitorial: remove leftovers from merge conflict
apparently harmless and unique
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Signed-off-by: Avi Kivity <avi@qumranet.com>
apparently harmless and unique
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| Makefile.target | diffblobblamehistory |