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)
commiteeca7360f756f7e36e846f35018df20808c7ef63
tree4810d3c615b87dc7eec2d310b8af84569b52dd02
parent8cf1fb21632d302fad6404f891b002ab8c13b1b4
parentc92761fd9efcbbcb59e7bf4db88e29ce03229889
Merge git://git./linux/kernel/git/davem/sparc

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Don't do hypervisor calls on non-sun4v in DS driver.