Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jan 2010 00:01:58 +0000 (16:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jan 2010 00:01:58 +0000 (16:01 -0800)
commiteb1c838fca2248ae62e5472b496ab52d3d774cc5
treedc1e70881e0048fc67131f009e25a1aaece60901
parentdb677ffa5f5a4f15b9dad4d132b3477b80766d82
parente04ed38d4e0cd32141f723560efcc8252b0241e2
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 Niagara2 perf event handling.
  sparc64: Fix NMI programming when perf events are active.
  bbc_envctrl: Clean up properly if kthread_run() fails.