git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e21ded5
451fd72
)
Merge branch 'linus' into perf/core, to fix conflicts
author
Ingo Molnar
<mingo@kernel.org>
Sun, 24 Aug 2014 20:32:24 +0000
(22:32 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Sun, 24 Aug 2014 20:32:24 +0000
(22:32 +0200)
Conflicts:
arch/x86/kernel/cpu/perf_event_intel_uncore*.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff