summaryrefslogtreecommitdiffstats
path: root/net/sched/sch_netem.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-09 09:26:56 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-09 09:26:56 +0200
commit545feeff158e03318bfaf34d0877da7ebfea3540 (patch)
tree3abe37b7b351f2badc6fda8b1ee85b1bfc7400d5 /net/sched/sch_netem.c
parentMerge tag 'usb-ci-v4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentUSB: serial: option: add even more ZTE device ids (diff)
downloadlinux-545feeff158e03318bfaf34d0877da7ebfea3540.tar.xz
linux-545feeff158e03318bfaf34d0877da7ebfea3540.zip
Merge tag 'usb-serial-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes: USB-serial fixes for v4.6-rc7 Here are some more new device ids. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'net/sched/sch_netem.c')
0 files changed, 0 insertions, 0 deletions