| commit | 6c24499f40d96bf07a85b709fb1bee5cea611a1d | [log] [tgz] |
|---|---|---|
| author | Steven Rostedt <rostedt@goodmis.org> | Mon Apr 29 20:08:14 2013 -0400 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 30 07:23:08 2013 -0700 |
| tree | 7f6591997eeb5b8a74246acb22780b9189cc1d56 | |
| parent | 500fcbc4a9f91dfd011c9a6caec80a55e14fd338 [diff] |
tracing: Fix small merge bug During the 3.10 merge, a conflict happened and the resolution was almost, but not quite, correct. An if statement was reversed. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> [ Duh. That was just silly of me - Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>