tree 1b24773d7fc90d14ecc682d407e1b2560e755c77
parent 7282ec8cb4f82287c2aef20a24328b42c630f7cb
parent 03701d6ebd1fd1871b5965356f6d8e90ebe53699
author David S. Miller <davem@davemloft.net> 1392251033 -0500
committer David S. Miller <davem@davemloft.net> 1392251033 -0500

Merge branch 'net_sched'

Cong Wang says:

====================
net_sched: act: more cleanup and improvement

v2 -> v3:
* fix a mis-splitted patch
* keep hinfo as a pointer in ops

v1 -> v2:
* Fix a bug noticed by Jamal
* Drop patches already merged into net-next
* Add patch 5/5

Patches are cleanup's for the structures of tc actions, except patch 4
which is an improvement.

See each patch for details.
====================

Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>