Pull error-inject into release branch

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/ia64/defconfig
index 153bfdc0182d6edf2cf6f3738feacf14e4119bad,327e1f511f8c9b1602d0056332d30c59f0863a7a..90bd9601cddef047062a594be3e682b31548fcce
--- 1/arch/ia64/defconfig
--- 2/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@@ -164,15 -144,8 +164,16 @@@ CONFIG_COMPAT=
  CONFIG_IA64_MCA_RECOVERY=y
  CONFIG_PERFMON=y
  CONFIG_IA64_PALINFO=y
+ # CONFIG_MC_ERR_INJECT is not set
  CONFIG_SGI_SN=y
 +# CONFIG_IA64_ESI is not set
 +
 +#
 +# SN Devices
 +#
 +CONFIG_SGI_IOC3=m
 +CONFIG_KEXEC=y
 +CONFIG_CRASH_DUMP=y
  
  #
  # Firmware Drivers

diff --cc include/asm-ia64/pal.h
Simple merge