tree 85ed65fe25c5fadac31c260eb843ee3540a1e006
parent 9d10890792a96ed796a44565924327aa276fa468
parent a9e8d1a6b87167116e5779378f1d25ffed2e833b
author Linus Torvalds <torvalds@linux-foundation.org> 1348263110 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1348263110 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc updates from David Miller:

1) Debugging builds on 32-bit sparc need to handle the R_SPARC_DISP32
   relocation, not just 64-bit sparc.  From Andreas Larsson.

2) Wei Yongjun noticed that module_alloc() on sparc can return an
   error pointer, but that's not allowed.  module_alloc() should
   return only a valid pointer, or NULL.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix the return value of module_alloc()
  sparc32: Enable the relocation target R_SPARC_DISP32 for sparc32