Fix up merge.
authorBen Pfaff <blp@nicira.com>
Thu, 22 Jul 2010 19:40:24 +0000 (12:40 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 22 Jul 2010 19:40:24 +0000 (12:40 -0700)
commit0eb683a39093dd776074516d56e065995ead950d
tree3da72346b109444c3ea49c26e7239eb070bec81d
parent966b5d43f2bc060dca3c19767db0a3dcd1ebb799
Fix up merge.
datapath/actions.c
lib/netdev-gre.c
lib/xfif-netdev.c
lib/xfif.c
ofproto/wdp-xflow.c