| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 14 Jan 2013 16:17:22 +0000 (08:17 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 14 Jan 2013 16:17:22 +0000 (08:17 -0800) |
Pull sparc updates from David Miller:
1) Add finit_module syscall entry.
2) Remove stray __dev{init,exit} references, from Sam Ravnborg.
Fix up conflicts in the sparc PCI code due to whitespace differences in
the __dev{init,exit} removal (which also came in through Greg).
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: remove __devinit, __devexit annotations
sparc: Hook up finit_module syscall.
1) Add finit_module syscall entry.
2) Remove stray __dev{init,exit} references, from Sam Ravnborg.
Fix up conflicts in the sparc PCI code due to whitespace differences in
the __dev{init,exit} removal (which also came in through Greg).
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: remove __devinit, __devexit annotations
sparc: Hook up finit_module syscall.
Trivial merge