aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-24 19:57:43 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-24 19:57:43 +1000
commit5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89 (patch)
treed283eb52fda7b5db060514599259e568abfd97ac /arch/x86
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 (diff)
parentmodule: fix missing semicolons in MODULE macro usage (diff)
downloadlinux-dev-5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89.tar.xz
linux-dev-5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: module: fix missing semicolons in MODULE macro usage param: add null statement to compiled-in module params module: fix linker error for MODULE_VERSION when !MODULE and CONFIG_SYSFS=n module: show version information for built-in modules in sysfs
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions