Merge commit 'v2.6.37-rc7' into x86/security
authorIngo Molnar <mingo@elte.hu>
Thu, 23 Dec 2010 08:48:41 +0000 (09:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 23 Dec 2010 08:48:41 +0000 (09:48 +0100)
1  2 
include/linux/module.h
kernel/module.c

Simple merge
diff --cc kernel/module.c
Simple merge