]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 500fcbc) | patch
tracing: Fix small merge bug
authorSteven Rostedt <rostedt@goodmis.org>
Tue, 30 Apr 2013 00:08:14 +0000 (20:08 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 14:23:08 +0000 (07:23 -0700)
commit6c24499f40d96bf07a85b709fb1bee5cea611a1d
tree7f6591997eeb5b8a74246acb22780b9189cc1d56tree | snapshot
parent500fcbc4a9f91dfd011c9a6caec80a55e14fd338commit | 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>
kernel/trace/trace.c diff | blob | history
Linux kernel for KaRo TX COM modules