git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b5210b2
f192382
)
Merge branch 'perf/urgent' into perf/core
author
Ingo Molnar
<mingo@kernel.org>
Sun, 21 Apr 2013 08:57:33 +0000
(10:57 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Sun, 21 Apr 2013 08:57:33 +0000
(10:57 +0200)
Conflicts:
arch/x86/kernel/cpu/perf_event_intel.c
Merge in the latest fixes before applying new patches, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff