Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Apr 2012 19:41:21 +0000 (12:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Apr 2012 19:41:21 +0000 (12:41 -0700)
Pull sparc fixes from David Miller.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Eliminate obsolete __handle_softirq() function
  sparc64: Fix bootup crash on sun4v.


Trivial merge