]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc61a0a54d2882250e1c11c8df9c72e6f490bb8d2
treedc1e70881e0048fc67131f009e25a1aaece60901
parentbc10afd397969ae3c7771f009bbfcec2d0452048
parent231e35f2238996e58f5b72301e797ebb69ef8984
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.