Merge branch 'for-2.6.23' into merge

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc arch/powerpc/configs/holly_defconfig
Simple merge

diff --cc arch/powerpc/configs/ps3_defconfig
index 956d1df61e0fab9ab866877b563e60e0ff7860bc,2c75758162573dce02300c36a0a94566f8321aa2..d0b43df444267a7696d7a0e9206461db66e4a8e2
--- 1/arch/powerpc/configs/ps3_defconfig
--- 2/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@@ -478,7 -484,8 +484,8 @@@ CONFIG_NETDEVICES=
  # CONFIG_NET_ETHERNET is not set
  CONFIG_MII=m
  CONFIG_NETDEV_1000=y
 -# CONFIG_NETDEV_10000 is not set
 +CONFIG_NETDEV_10000=y
+ CONFIG_GELIC_NET=y
  
  #
  # Wireless LAN

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

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

diff --cc include/asm-powerpc/pgtable-ppc32.h
Simple merge

diff --cc include/asm-powerpc/pgtable-ppc64.h
Simple merge