diff options
| author | Linus Torvalds <[email protected]> | 2009-09-20 22:57:28 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-09-20 22:57:28 +0000 |
| commit | dcbb5593d980bbf4ceef320f8c75210398ed84db (patch) | |
| tree | aa712d3a48cb34087220a9af4c66953020d87ebf /tools/perf/builtin-annotate.c | |
| parent | Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
| download | kernel-dcbb5593d980bbf4ceef320f8c75210398ed84db.tar.gz kernel-dcbb5593d980bbf4ceef320f8c75210398ed84db.zip | |
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 <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions