tree 3c8bebb277462ba0de9d44233a970d34056dc45e
parent c62f981f9309486ba5546edbb5925f71e441fa65
parent cb655d0f3d57c23db51b981648e452988c0223f9
author Ingo Molnar <mingo@elte.hu> 1286527587 +0200
committer Ingo Molnar <mingo@elte.hu> 1286527587 +0200

Merge commit 'v2.6.36-rc7' into perf/core

Conflicts:
	arch/x86/kernel/module.c

Merge reason: Resolve the conflict, pick up fixes.

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