From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Mar 2010 16:24:47 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.34-rc1~202
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6895210e89df20520916c94a4dc148a43229053e;p=~emulex%2Finfiniband.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Make prom entry spinlock NMI safe.
  sparc64: Kill off old sys_perfctr system call and state.
  sparc: Update defconfigs.
  sparc: Provide io{read,write}{16,32}be().
---

6895210e89df20520916c94a4dc148a43229053e