git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
f0b9abf
)
Merge branch 'linus' into perf/core
author
Ingo Molnar
<mingo@kernel.org>
Sat, 8 Dec 2012 14:25:06 +0000
(15:25 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Sat, 8 Dec 2012 14:25:06 +0000
(15:25 +0100)
Conflicts:
tools/perf/Makefile
tools/perf/builtin-test.c
tools/perf/perf.h
tools/perf/tests/parse-events.c
tools/perf/util/evsel.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
No differences found