tree dc1e70881e0048fc67131f009e25a1aaece60901
parent db677ffa5f5a4f15b9dad4d132b3477b80766d82
parent e04ed38d4e0cd32141f723560efcc8252b0241e2
author Linus Torvalds <torvalds@linux-foundation.org> 1262736118 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262736118 -0800

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.