Merge commit 'v2.6.36-rc7' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 8 Oct 2010 08:46:27 +0000 (10:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 8 Oct 2010 08:46:27 +0000 (10:46 +0200)
commit7cd2541cf2395962daf98ec32a141aba3398a9b2
tree3c8bebb277462ba0de9d44233a970d34056dc45e
parentc62f981f9309486ba5546edbb5925f71e441fa65
parentcb655d0f3d57c23db51b981648e452988c0223f9
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>
Makefile
arch/x86/kernel/module.c
include/linux/module.h
kernel/module.c