]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into next
authorDavid Ahern <dsahern@gmail.com>
Thu, 2 Jan 2020 17:49:45 +0000 (17:49 +0000)
committerDavid Ahern <dsahern@gmail.com>
Thu, 2 Jan 2020 17:49:45 +0000 (17:49 +0000)
Signed-off-by: David Ahern <dsahern@gmail.com>
1  2 
tc/q_fq_codel.c

diff --cc tc/q_fq_codel.c
Simple merge