Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Aug 2011 07:35:46 +0000 (00:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Aug 2011 07:35:46 +0000 (00:35 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Don't do hypervisor calls on non-sun4v in DS driver.


Trivial merge