Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

Conflicts:

	palacios/src/devices/nic_bridge.c

diff --cc palacios/src/devices/lnx_virtio_nic.c
Simple merge

diff --cc palacios/src/devices/nic_bridge.c
index eb5500b,00ce9b6..b77e6e6
--- 1/palacios/src/devices/nic_bridge.c
--- 2/palacios/src/devices/nic_bridge.c
+++ b/palacios/src/devices/nic_bridge.c
@@@ -49,12 -49,12 +49,11 @@@ static int bridge_send(uint8_t * buf, u
      return V3_send_raw(buf, len);
  }
  
--
- static int packet_input(struct v3_vm_info * vm, 
-                            struct v3_packet_event * evt, 
-                            void * private_data) {
-     struct nic_bridge_state *bridge = (struct nic_bridge_state *)private_data;
- 
+ static int packet_input(struct v3_vm_info * vm,
+                       struct v3_packet_event * evt, 
+                       void * private_data) {
+     struct nic_bridge_state * bridge = (struct nic_bridge_state *)private_data;
 -
++ 
      PrintDebug("NIC_BRIDGE: Incoming packet size: %d\n", evt->size);
  
      return bridge->net_ops.recv(evt->pkt, 

diff --cc palacios/src/devices/vnet_nic.c
Simple merge