aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_choke.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-04 23:13:49 -0700
committerDavid S. Miller <davem@davemloft.net>2014-06-04 23:13:49 -0700
commit555878b9ee83b08701100baa0fd79d3954a37ce7 (patch)
tree762df762094bc72ca13d4b4a3421cfe766d92f01 /net/sched/sch_choke.c
parentMerge branch 'inet_csums' (diff)
parentisdn/capi: fix (middleware) device nodes (diff)
downloadlinux-dev-555878b9ee83b08701100baa0fd79d3954a37ce7.tar.xz
linux-dev-555878b9ee83b08701100baa0fd79d3954a37ce7.zip
Merge branch 'isdn-capi'
Tilman Schmidt says: ==================== ISDN patches for net-next (v2) Here's v2 of the series of patches for the ISDN CAPI subsystem prepared by Paul Bolle and reviewed by yours truly. It reflects GregKH's review, resulting in a substantial simplification. Please merge via net-next. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_choke.c')
0 files changed, 0 insertions, 0 deletions