From: Linus Torvalds <torvalds@linux-foundation.org> Date: Mon, 24 Jan 2011 09:57:43 +0000 (+1000) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge git://git./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 --- 5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89