summaryrefslogtreecommitdiff
path: root/net/openvswitch/flow_netlink.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-01-26 15:42:01 -0800
committerDavid S. Miller <davem@davemloft.net>2015-01-26 15:42:01 -0800
commit707d79e5cdcf7833d31fea9712f11b185ce25822 (patch)
tree6bcdc972de744e7c7129a599dba5bd12403d46b5 /net/openvswitch/flow_netlink.c
parent4141d93fc55a33bbe74c9de48f1f99dd85bf0441 (diff)
parentef186f25fdf00d92c6bd5d3301fc0ee44f17ca33 (diff)
Merge tag 'linux-can-next-for-3.20-20150121' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says: ==================== pull-request: can-next 2015-21-01 this is a pull request of 4 patches for net-next/master. Andri Yngvason contributes one patch to further consolidate the CAN state change handling. The next patch is by kbuild test robot/Fengguang Wu which fixes a coccinelle warning in the CAN infrastructure. The two last patches are by me, they remove a unused variable from the flexcan and at91_can driver. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow_netlink.c')
0 files changed, 0 insertions, 0 deletions