]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Jan 2013 16:17:22 +0000 (08:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Jan 2013 16:17:22 +0000 (08:17 -0800)
commitdfe0c24d43762992c117dfca4ddf9d279d30d2ef
treedb9d1c323be95161a6ca0b6d5f00ff367e6fae0d
parentde6f79e591f3b4e331504d1e935e4e9123ff77c7
parent603ddd75e5aeac34096d0e31cbcb434c0ccf16ac
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

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.