diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-31 14:32:30 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-31 14:32:30 -0400 |
| commit | cee5ee95bf82c32cfe9896403730f3a5fa5531db (patch) | |
| tree | 607460bce2b086eb5afff02009bebe2b903255aa /scripts/tracing | |
| parent | edd9889ed9b3b73df92a5862794d8a9d63a9cad6 (diff) | |
| parent | 6a0a453177b4ed9de73a93af7f15473389b3248b (diff) | |
Merge tag 'v3.14.14' into v3.14-rt
This is the 3.14.14 stable release
Conflicts:
kernel/Kconfig.locks
kernel/trace/trace.c
Diffstat (limited to 'scripts/tracing')
0 files changed, 0 insertions, 0 deletions