OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0e73453
215432e
)
Merge branch 'perf/urgent' into perf/core to fix conflicts
author
Ingo Molnar
<mingo@kernel.org>
Mon, 4 Nov 2013 06:49:35 +0000
(07:49 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Mon, 4 Nov 2013 06:49:35 +0000
(07:49 +0100)
Conflicts:
tools/perf/bench/numa.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1
2
include/uapi/linux/perf_event.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/uapi/linux/perf_event.h
Simple merge