Merge branch 'linux-2.6'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/powerpc/kernel/iommu.c
Simple merge

diff --cc arch/powerpc/mm/slb.c
Simple merge

diff --cc arch/powerpc/platforms/cell/Makefile
index 3cd565a,39d695c..c89964c
--- 1/arch/powerpc/platforms/cell/Makefile
--- 2/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@@ -19,7 -19,8 +19,8 @@@ spu-manage-$(CONFIG_PPC_CELLEB)               += spu
  spu-manage-$(CONFIG_PPC_CELL_NATIVE)  += spu_manage.o
  
  obj-$(CONFIG_SPU_BASE)                        += spu_callbacks.o spu_base.o \
 -                                         spu_syscalls.o \
+                                          spu_notify.o \
 +                                         spu_syscalls.o spu_fault.o \
                                           $(spu-priv1-y) \
                                           $(spu-manage-y) \
                                           spufs/

diff --cc arch/powerpc/platforms/cell/spufs/context.c
Simple merge

diff --cc arch/powerpc/platforms/cell/spufs/sched.c
Simple merge

diff --cc include/asm-powerpc/spu.h
index 5ca30e2,34b7807..f07c99b
--- 1/include/asm-powerpc/spu.h
--- 2/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@@ -302,8 -299,11 +303,11 @@@ struct notifier_block
  int spu_switch_event_register(struct notifier_block * n);
  int spu_switch_event_unregister(struct notifier_block * n);
  
+ extern void notify_spus_active(void);
+ extern void do_notify_spus_active(void);
+ 
  /*
 - * This defines the Local Store, Problem Area and Privlege Area of an SPU.
 + * This defines the Local Store, Problem Area and Privilege Area of an SPU.
   */
  
  union mfc_tag_size_class_cmd {