projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
212d95d
db0dc75
)
Merge branch 'perf/urgent' into perf/core
author
Ingo Molnar
<mingo@kernel.org>
Wed, 6 Jun 2012 15:00:37 +0000
(17:00 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 6 Jun 2012 15:22:57 +0000
(17:22 +0200)
Eliminate a conflict in a patch I am going to apply.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
projects / profile / ivi / kernel-adaptation-intel-automotive.git / commitdiff