From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Aug 2011 18:28:18 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v3.1-rc5~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9e79e3e9dd9672b37ac9412e9a926714306551fe;p=users%2Fjedix%2Flinux-maple.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Only Panther cheetah+ chips have POPC.
---

9e79e3e9dd9672b37ac9412e9a926714306551fe