projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b719f43 b7c13f7)
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)
commit7c8284c3aa127ffe72a90a1bad52183ec9ad870a
treedb9d1c323be95161a6ca0b6d5f00ff367e6fae0dtree
parentb719f43059903820c31edb30f4663a2818836e7fcommit | diff
parentb7c13f76fda994284521f6ef996119c25282bdebcommit | diff
Merge git://git./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.
MicroBlaze GIT Repository