tree 90d7139bea2f49e947f27af92614fa6eca50b64d
parent 6d7aa9d721c8c640066142fd9534afcdf68d7f9d
parent b419148e567728f6af0c3b01965c1cc141e3e13a
author Ingo Molnar <mingo@elte.hu> 1257332055 +0100
committer Ingo Molnar <mingo@elte.hu> 1257332385 +0100

Merge commit 'v2.6.32-rc6' into perf/core

Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

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