summaryrefslogtreecommitdiff
path: root/include/trace/events/net.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/trace/events/net.h')
0 files changed, 0 insertions, 0 deletions
next.git/patch/sound/pci/pcxhr/pcxhr_mix22.h?id=62ed8ceda1699acae01b666497f004bfd3d67a6f'>patch) treefe38c83c49dfd568b540666948ef78cb9d082c38 /sound/pci/pcxhr/pcxhr_mix22.h parent1c3415a06b1016a596bfe59e0cfee56c773aa958 (diff)parent7a308bb3016f57e5be11a677d15b821536419d36 (diff)
Merge tag 'v4.10-rc5' into for-linus
Sync up with mainline to apply fixup to a commit that came through power supply tree.
Diffstat (limited to 'sound/pci/pcxhr/pcxhr_mix22.h')