From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Aug 2011 07:35:46 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v3.1-rc2~20
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=eeca7360f756f7e36e846f35018df20808c7ef63;p=linux.git

Merge git://git.kernel.org/pub/scm/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.
---

eeca7360f756f7e36e846f35018df20808c7ef63