tree a1a8cc85948c086aa12a1d8014151a7ca7c04ea8
parent 9fc3af467d0749989518a23f7289a6f44e5cb214
parent 9fe6206f400646a2322096b56c59891d530e8d51
author Ingo Molnar <mingo@elte.hu> 1280730596 +0200
committer Ingo Molnar <mingo@elte.hu> 1280730714 +0200

Merge commit 'v2.6.35' into perf/core

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>