From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Apr 2010 19:14:44 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.34-rc4~74
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=db217dece3003df0841bacf9556b5c06aa097dae;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:
  sunxvr500: Ignore secondary output PCI devices.
  sparc64: Implement perf_arch_fetch_caller_regs
  sparc64: Update defconfig.
  sparc64: Fix array size reported by vmemmap_populate()
  sparc: Fix regset register window handling.
  drivers/serial/sunsu.c: Correct use after free
---

db217dece3003df0841bacf9556b5c06aa097dae