]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit325a943ae407418940e5c49f9d0d8ea932f2a115
tree3c8bebb277462ba0de9d44233a970d34056dc45e
parent85e61a551b69463935372e71eb2aa4bccdc25ffb
parent7329675ae084388731f0daa1ab79f8eff0953ed2
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