From: Jack Lange <jacklange@cs.pitt.edu>
Date: Wed, 8 Jun 2011 17:55:47 +0000 (-0500)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=5e16adcc49f8c77319004ada0276ccd301c67dd1

Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

Conflicts:

	linux_module/palacios-vm.c
---

5e16adcc49f8c77319004ada0276ccd301c67dd1
diff --cc linux_module/palacios.h
index 8923361,9fe9c29..62f43f1
--- a/linux_module/palacios.h
+++ b/linux_module/palacios.h
@@@ -64,10 -64,6 +64,10 @@@ struct v3_guest 
  
      char name[128];
  
 +
 +    struct rb_root vm_ctrls;
- 
++    struct list_head exts;
 +
      struct list_head files;
      struct list_head streams;
      struct list_head sockets;