tree eda863205e83afe54cbedcf15cdac416cdec2cf5
parent 4f31f3080943c7e3541f07df326f06d598a067d0
parent 04d91cb8163f7f946e348b2362a6e5dfa5f06b13
author Linus Torvalds <torvalds@linux-foundation.org> 1217259205 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217259205 -0700

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:
  sparc: Set CONFIG_HAVE_ARCH_TRACEHOOK
  sparc: Add task_pt_regs().
  sparc: Add call to tracehook_signal_handler().
  sparc: Create and use TIF_NOTIFY_RESUME.
  sparc: Use tracehook routines in syscall_trace().
  sparc64: tracehook: CONFIG_HAVE_ARCH_TRACEHOOK
  sparc: Add user_stack_pointer().
  sparc64: tracehook_signal_handler
  sparc64: tracehook: TIF_NOTIFY_RESUME
  sparc: Add asm/syscall.h
  sparc64: tracehook syscall
  sparc: enable headers_export again
  sparc, sparc64: use arch/sparc/include