| commit | 5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 24 19:57:43 2011 +1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 24 19:57:43 2011 +1000 |
| tree | d283eb52fda7b5db060514599259e568abfd97ac | |
| parent | d20761a7995773dfae4a54fdd26a7857b861adb5 [diff] | |
| parent | 577d6a7c3a0e273e115c65a148b71be6c1950f69 [diff] |
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