git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
996a798
)
loongson: fix cut-and-paste mis-merge
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 20 Sep 2009 22:57:28 +0000
(15:57 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 20 Sep 2009 22:57:28 +0000
(15:57 -0700)
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 <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
No differences found