Merge commit 'brent/register_phys_mem'
commit9f828560833499e27d6f9f5281307c0ea79c6dff
authorDiego Ongaro <diego.ongaro@rice.edu>
Sun, 26 Oct 2008 02:50:11 +0000 (25 21:50 -0500)
committerDiego Ongaro <diego.ongaro@rice.edu>
Sun, 26 Oct 2008 02:50:11 +0000 (25 21:50 -0500)
treeb15ef47eca7da48196dc3d6110fc3c929e179184
parentb8478c7bbc1bac6648db1b2fb4bf9a30af3fda88
parent3e685cb3a5687e63d43eb890e7709be77de29203
Merge commit 'brent/register_phys_mem'

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