projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7031281e02bf951a2259849217193fb9d75a9762
tree54dae585a10100f977c525399b7598855b3ca7dftree | snapshot
parentba77c9e11111a172c9e8687fe16a6a173a61916fcommit | diff
parentd62d77fd18cc82e839e49b7ef3360e4411f7d2e5commit | 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>
ep93xx device tree rework repo: git://git.maquefel.me/linux.git