git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
18408dd
39e6dd7
)
Merge branch 'perfcounters/urgent' into perfcounters/core
author
Ingo Molnar
<mingo@elte.hu>
Sat, 15 Aug 2009 10:06:12 +0000
(12:06 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Sat, 15 Aug 2009 10:06:12 +0000
(12:06 +0200)
Conflicts:
kernel/perf_counter.c
Merge reason: update to latest upstream (-rc6) and resolve
the conflict with urgent fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff