git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fc3af4 9fe6206)
Merge commit 'v2.6.35' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 2 Aug 2010 06:29:56 +0000 (08:29 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 2 Aug 2010 06:31:54 +0000 (08:31 +0200)
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c

Merge reason: Resolve the conflicts and update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge
Pandora Kernel Repository