From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 8 Oct 2010 08:46:27 +0000 (+0200)
Subject: Merge commit 'v2.6.36-rc7' into perf/core
X-Git-Tag: v2.6.37-rc1~214^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd2541cf2395962daf98ec32a141aba3398a9b2;p=pandora-kernel.git

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>
---

7cd2541cf2395962daf98ec32a141aba3398a9b2
Reading git-diff-tree failed