diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-08-26 18:27:51 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-08-26 18:27:51 -0400 |
| commit | cd190b16938ba9cdd3246400214cc4fe016f9202 (patch) | |
| tree | 79a8329af6b8fc22a2a6c735cc6db94690f8b43d /localversion-rt | |
| parent | 04615847526cd472de404873c3b3f58ed467ca44 (diff) | |
| parent | 92488f4c9f687cc0e274be561f7b168743f59f20 (diff) | |
Merge tag 'v3.10.50' into v3.10-rt
This is the 3.10.50 stable release
Conflicts:
arch/x86/Kconfig
kernel/Kconfig.locks
kernel/trace/trace.c
Diffstat (limited to 'localversion-rt')
0 files changed, 0 insertions, 0 deletions