Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Apr 2010 16:20:55 +0000 (09:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Apr 2010 16:20:55 +0000 (09:20 -0700)
commitac8bf564307962a763a52b34e771205c58b76ec8
tree851fe4ebd22cca979744dace54a8d628143bbc4b
parent34388d1c4feae50d61d6f4ec7594b9076d6d24db
parent28a1f533ae8606020238b840b82ae70a3f87609e
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 hardirq tracing in trap return path.
  sparc64: Use correct pt_regs in decode_access_size() error paths.
  sparc64: Fix PREEMPT_ACTIVE value.
  sparc64: Run NMIs on the hardirq stack.
  sparc64: Allocate sufficient stack space in ftrace stubs.
  sparc: Fix forgotten kmemleak headers inclusion