diff options
author | David S. Miller <davem@davemloft.net> | 2016-06-25 12:08:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-25 12:08:41 -0400 |
commit | 36195d869e4b1dbf81bafa3a31bb095a3c013bdd (patch) | |
tree | ec8b2281e6358254b23181e533623e1bfa74b5c6 /net/sched/sch_netem.c | |
parent | b38066daaa81fd2f9ca2c9f103d4d56aad8906ee (diff) | |
parent | 4b129ae3b692653de1794ff6a5746691ad77c433 (diff) | |
download | linux-36195d869e4b1dbf81bafa3a31bb095a3c013bdd.tar.bz2 |
Merge branch 'liquidio-next'
Raghu Vatsavayi says:
====================
liquidio: updates and bug fixes
Please consider following patch series for liquidio bug fixes
and updates on top of net-next. Following patches should be
applied in the following order as some of them depend on
earlier patches in the series.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_netem.c')
0 files changed, 0 insertions, 0 deletions