git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 500fcbc)
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)
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>

No differences found
Pandora Kernel Repository