projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 996a798) | patch
loongson: fix cut-and-paste mis-merge
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2009 22:57:28 +0000 (15:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Sep 2009 22:57:28 +0000 (15:57 -0700)
commitdcbb5593d980bbf4ceef320f8c75210398ed84db
treeaa712d3a48cb34087220a9af4c66953020d87ebftree
parent996a798abb36aa92d0bad64ba23f4c685ce39537commit | diff
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 <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/mips/loongson/common/time.c diff | blob | history
MicroBlaze GIT Repository