From: Lei Xia <lxia@northwestern.edu>
Date: Tue, 30 Sep 2008 22:27:02 +0000 (-0500)
Subject: Merge branch 'lwip_dev' of /home/palacios/palacios into lwip_dev
X-Git-Tag: 1.0~3^2~11^2~1
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=73ce005b59a3c032c7a4f64bce17f6eb1bf8ea20;p=palacios.git

Merge branch 'lwip_dev' of /home/palacios/palacios into lwip_dev

Conflicts:
	palacios/src/lwip/arch/sys_arch.c
---

73ce005b59a3c032c7a4f64bce17f6eb1bf8ea20
diff --cc palacios/src/lwip/arch/sys_arch.c
index d5fa76d,289ed70..e390d98
--- a/palacios/src/lwip/arch/sys_arch.c
+++ b/palacios/src/lwip/arch/sys_arch.c
@@@ -188,7 -188,7 +188,6 @@@ current_thread(void
  }
  
  
--//!!!!!!!!!!!!backto this function later
  /*-----------------------------------------------------------------------------------*/
  sys_thread_t
  sys_thread_new(char *name, void (* function)(void *arg), void *arg, int stacksize, int prio)