From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jan 2010 00:01:58 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eb1c838fca2248ae62e5472b496ab52d3d774cc5;p=mv-sheeva.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: Fix Niagara2 perf event handling.
  sparc64: Fix NMI programming when perf events are active.
  bbc_envctrl: Clean up properly if kthread_run() fails.
---

eb1c838fca2248ae62e5472b496ab52d3d774cc5