From: Linus Torvalds Date: Sun, 20 Sep 2009 22:57:28 +0000 (-0700) Subject: loongson: fix cut-and-paste mis-merge X-Git-Tag: v2.6.32-rc1~624 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcbb5593d980bbf4ceef320f8c75210398ed84db;p=pandora-kernel.git loongson: fix cut-and-paste mis-merge Ingo points out that I screwed up when merging the 'timers-for-linus' branch in commit a03fdb7612874834d6847107198712d18b5242c7. A bit too much copy-and-pasting caused the end result to have an extraneous 'return' in the middle of an expression. That was obviously bogus. Blush. Reported-by-with-patch: Ingo Molnar Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed