diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 11:06:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 11:06:59 -0800 |
| commit | 2d47b8aac7ba697ffe05f839a3b4c3c628b4e430 (patch) | |
| tree | 566568a61eb9c482bad68c1facecce9a365f36ed /include/linux/fpga/fpga-mgr.h | |
| parent | Merge branch 'modversions' (modversions fixes for powerpc from Ard) (diff) | |
| parent | tracing/kprobes: Fix __init annotation (diff) | |
| download | wireguard-linux-2d47b8aac7ba697ffe05f839a3b4c3c628b4e430.tar.xz wireguard-linux-2d47b8aac7ba697ffe05f839a3b4c3c628b4e430.zip | |
Merge tag 'trace-v4.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt:
"Simple fix of s/static struct __init/static __init struct/"
* tag 'trace-v4.10-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/kprobes: Fix __init annotation
Diffstat (limited to 'include/linux/fpga/fpga-mgr.h')
0 files changed, 0 insertions, 0 deletions