Merge branch 'net_sched'
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Feb 2014 00:23:53 +0000 (19:23 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Feb 2014 00:23:53 +0000 (19:23 -0500)
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>

Trivial merge