openvswitch: Remove 5-tuple optimization.

The 5-tuple optimization becomes unnecessary with a later per-NUMA
node stats patch.  Remove it first to make the changes easier to
grasp.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --cc net/openvswitch/datapath.c
Simple merge

diff --cc net/openvswitch/flow.c
Simple merge

diff --cc net/openvswitch/flow.h
Simple merge

diff --cc net/openvswitch/flow_netlink.c
Simple merge

diff --cc net/openvswitch/flow_netlink.h
Simple merge

diff --cc net/openvswitch/flow_table.c
Simple merge

diff --cc net/openvswitch/flow_table.h
Simple merge