Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 15 Aug 2013 18:43:14 +0000 (20:43 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 15 Aug 2013 18:43:14 +0000 (20:43 +0200)
commitfa04edcedfe5285fd8ad3a4d70fecb38df18293d
tree9c10c60bead4e611ffc910438e9e5cb0677325b4
parent82377f4d4ab6de76318f649190d0301f117b270e
parent11aa8dff934c06a24ec23556c51122025c2232fa
Merge branch 'mainstream'

Conflicts:
lib/netdev.c
lib/automake.mk
lib/dpif-netdev.c
lib/netdev-provider.h
lib/netdev.c