Merge linux-2.6 into linux-acpi-2.6 test

diff --cc arch/ia64/Kconfig
index addf07393ef45f6470727c04e949573f2f3bb0b0,3deced637f07c814706698e6e90a10088aebe889..e1c9ea03f31fde5cf0d40deca90d56311d1e2034
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -357,6 -381,14 +357,12 @@@ source "kernel/power/Kconfig
  
  source "drivers/acpi/Kconfig"
  
 -endif
 -
+ if PM
+ 
+ source "arch/ia64/kernel/cpufreq/Kconfig"
+ 
+ endif
+ 
  endmenu
  
  if !IA64_HP_SIM

diff --cc arch/ia64/sn/kernel/irq.c
Simple merge

diff --cc arch/ia64/sn/kernel/sn2/sn_proc_fs.c
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge