Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Aug 2008 16:14:23 +0000 (09:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Aug 2008 16:14:23 +0000 (09:14 -0700)
commitd9c566198bfdf72a041322a093fdc1a2dc231170
tree908acd901d8deb0c6ff54323c96cf61d2f005faf
parent17263849c7ad2279667dd298083eceefcd1b5845
parent0a4949c4414af2eb91414bcd8e2a8ac3706f7dde
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Do not clobber %g7 in setcontext() trap.
  sparc64: Kill __show_regs().
  sparc: Add __KERNEL__ ifdef protection to pt_regs helpers.
  sparc64: Kill smp_report_regs().
  sparc64: Kill VERBOSE_SHOWREGS code.
  sparc64: Hook up trigger_all_cpu_backtrace().
  sparc64: Make global reg dumping even more useful.
  sparc: Ignore drivers/video/console/promcon_tbl.c conmakehash generated file
  sparc64: FUTEX_OP_ANDN fix
  sparc: merge of_platform_{32,64}.h
  sparc64: Kill isa_bus_type.
  sparc64: Fix global reg snapshotting on self-cpu.