projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
59cd358
731a737
)
Merge branch 'linus' into perf/urgent
author
Ingo Molnar
<mingo@kernel.org>
Wed, 30 May 2012 08:59:04 +0000
(10:59 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 30 May 2012 08:59:04 +0000
(10:59 +0200)
Merge back Linus's latest branch so that we pick up the uprobes changes.
( I tested this branch locally and while it's one from the middle of the
merge window it's a good one to base further work off. )
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge