git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
29bf4db
2a2662b
)
Merge branch 'perf/hw_breakpoints' into perf/core
author
Ingo Molnar
<mingo@kernel.org>
Wed, 28 Jan 2015 14:48:59 +0000
(15:48 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 28 Jan 2015 14:48:59 +0000
(15:48 +0100)
The new hw_breakpoint bits are now ready for v3.20, merge them
into the main branch, to avoid conflicts.
Conflicts:
tools/perf/Documentation/perf-record.txt
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff