projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba77c9e d62d77f)
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)
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>

Trivial merge
John Crispins staging tree