git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
682968e
a385ec4
)
Merge branch 'perf/core' into perf/uprobes
author
Ingo Molnar
<mingo@kernel.org>
Sat, 14 Apr 2012 11:18:27 +0000
(13:18 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Sat, 14 Apr 2012 11:19:04 +0000
(13:19 +0200)
Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge