Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcmastertorvalds/master
commit9e79e3e9dd9672b37ac9412e9a926714306551fe
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Aug 2011 18:28:18 +0000 (30 11:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Aug 2011 18:28:18 +0000 (30 11:28 -0700)
treebf9a6f763f90b0df4f36aec65b4f1cc00d9bf33d
parentebde8b0223020b0cdd18c284ab5c0bb67ebc787e
parent1a8e0da5937a6c87807083baa318cf8f98dac9aa
Merge git://git./linux/kernel/git/davem/sparc

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