From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Sep 2009 20:49:06 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: MMI-PSA29.97-13-9~27039
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d3acd16cda3a1cbaff7c579c0e054f0ece613d14;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix bootup with mcount in some configs.
  sparc64: Kill spurious NMI watchdog triggers by increasing limit to 30 seconds.
---

d3acd16cda3a1cbaff7c579c0e054f0ece613d14