Merge branch 'lwip_dev' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios...

diff --cc palacios/include/geekos/synch.h
index f5d7ebb,b1ad875..c452e31
--- 1/palacios/include/geekos/synch.h
--- 2/palacios/include/geekos/synch.h
+++ b/palacios/include/geekos/synch.h
@@@ -36,9 -35,9 +36,10 @@@ void Mutex_Destroy(struct Mutex *mutex)
  
  void Cond_Init(struct Condition* cond);
  void Cond_Wait(struct Condition* cond, struct Mutex* mutex);
+ int Cond_Wait_Timeout(struct Condition * cond, struct Mutex * mutex, uint_t ms);
  void Cond_Signal(struct Condition* cond);
  void Cond_Broadcast(struct Condition* cond);
 +void Cond_Destroy(struct Condition *cond); //added by Lei
  
  #define IS_HELD(mutex) \
      ((mutex)->state == MUTEX_LOCKED && (mutex)->owner == g_currentThread)

diff --cc palacios/include/geekos/timer.h
Simple merge

diff --cc palacios/src/geekos/timer.c
Simple merge