Merge http://jdike.stearns.org:5000/stack-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc arch/um/Kconfig
Simple merge

diff --cc arch/um/kernel/process.c
index 577efc8c13cd2aaf1d27172db53a826cc9ebd91a,a1daa5628553edaa3a057cc941c2ddeb8685f786..4c3aa45359eb70e7214fea2f46e8f2ac8e12717e
--- 1/arch/um/kernel/process.c
--- 2/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@@ -37,9 -37,9 +37,9 @@@
  #include "uml-config.h"
  #include "choose-mode.h"
  #include "mode.h"
 -#ifdef CONFIG_MODE_SKAS
 +#ifdef UML_CONFIG_MODE_SKAS
- #include "skas_ptrace.h"
  #include "skas.h"
+ #include "skas_ptrace.h"
  #endif
  
  void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int))

diff --cc arch/um/kernel/um_arch.c
Simple merge