Merge commit 'oleg/master2' (print vmcb)
commit94408efe3004fcce70d513b20119e3a376ac42fa
authorDiego Ongaro <diego.ongaro@rice.edu>
Sat, 25 Oct 2008 03:45:36 +0000 (24 22:45 -0500)
committerDiego Ongaro <diego.ongaro@rice.edu>
Sat, 25 Oct 2008 03:45:36 +0000 (24 22:45 -0500)
tree3d894b31bb7bad0c0cd37e0950d032f1d4b541f5
parentba3ae17978224711fca3857efcfce2cc5c56390f
parent3c5489b9562cff82b320d2c4abf7b8dca836f86d
Merge commit 'oleg/master2' (print vmcb)

Conflicts:
sys/kern/kern_fkvm.c
sys/kern/kern_fkvm.c