Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 23 Jul 2013 08:56:22 +0000 (10:56 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Tue, 23 Jul 2013 08:56:22 +0000 (10:56 +0200)
commitcc36576070df622d0fc7a6e26ce01027e12b5b59
tree901138d8033a5ffa548645155cd1dec45571d0d0
parentbbb8dee92d639331e8bd81823638267dcc895396
parent3d097064102780d79c9124f507160d538465ce64
Merge branch 'mainstream'
lib/dpif-netdev.c
lib/dpif.c