]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f182efa) | 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)
commit106c6e6787e2a9671ab16b295b2f7f44bea4e0f4
treeaa712d3a48cb34087220a9af4c66953020d87ebftree | snapshot
parentf182efa919a1886397510cb333ecba56fa2b5b89commit | diff
loongson: fix cut-and-paste mis-merge

Ingo points out that I screwed up when merging the 'timers-for-linus'
branch in commit 861e36c1f23f4f6def6ce2248dc2e74f295d2337.

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
Linux Kernel Source Tree.