From: Steven Rostedt Date: Tue, 30 Apr 2013 00:08:14 +0000 (-0400) Subject: tracing: Fix small merge bug X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~121 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c24499f40d96bf07a85b709fb1bee5cea611a1d;p=pandora-kernel.git 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 [ Duh. That was just silly of me - Linus ] Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed