summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-09-29 19:52:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-29 19:52:52 -0700
commit97f9a3c4eee55b0178b518ae7114a6a53372913d (patch)
tree03b87ee366ed32ac87b3e0919c7919c5223fda09 /kernel/trace/trace.h
parent1eb80d6ffb1759968374606c1e36ea88e043e66d (diff)
parentdc925a36060e8cef050a9d05c64dae1c30dc5027 (diff)
downloadlinux-97f9a3c4eee55b0178b518ae7114a6a53372913d.tar.bz2
Merge tag 'char-misc-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull Documentation/process update from Greg KH: "Here are two small Documentation/process/embargoed-hardware-issues.rst file updates that missed my previous char/misc pull request. The first one adds an Intel representative for the process, and the second one cleans up the text a bit more when it comes to how the disclosure rules work, as it was a bit confusing to some companies" * tag 'char-misc-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: Documentation/process: Clarify disclosure rules Documentation/process: Volunteer as the ambassador for Intel
Diffstat (limited to 'kernel/trace/trace.h')
0 files changed, 0 insertions, 0 deletions