]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 629b926 906a099)
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Sat, 21 Nov 2009 12:57:35 +0000 (13:57 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 21 Nov 2009 12:57:35 +0000 (13:57 +0100)
commitd88a19bd179d2a4c21d6a7c46959c485ac4b06d1
tree54dae585a10100f977c525399b7598855b3ca7dftree | snapshot
parent629b9269146ad6ba393a70a90f54a6971fe595f8commit | diff
parent906a099a9ce0056cfffe34fd0d3c819e1dcb2301commit | diff
Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/util/symbol.c

Merge reason: this fix will get merged in .33, not .32, plus
              resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Linux Kernel Source Tree.