Pull miscellaneous into release branch

Conflicts:

	arch/ia64/kernel/mca.c

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/ia64/kernel/asm-offsets.c
Simple merge

diff --cc arch/ia64/kernel/fsys.S
Simple merge

diff --cc arch/ia64/kernel/mca.c
index 607006a6a976750d4b050b3032b77d52940ad946,1ae512910870da963c3cfe6fe9695dd443bf821d..e51bced3b0fad2b6bbbb050cc0ac828ba6b68c15
--- 1/arch/ia64/kernel/mca.c
--- 2/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@@ -1311,15 -1268,8 +1313,13 @@@ ia64_mca_handler(struct pt_regs *regs, 
        } else {
                /* Dump buffered message to console */
                ia64_mlogbuf_finish(1);
- #ifdef CONFIG_KEXEC
-               atomic_set(&kdump_in_progress, 1);
-               monarch_cpu = -1;
- #endif
        }
+ 
 +      if (__get_cpu_var(ia64_mca_tr_reload)) {
 +              mca_insert_tr(0x1); /*Reload dynamic itrs*/
 +              mca_insert_tr(0x2); /*Reload dynamic itrs*/
 +      }
++
        if (notify_die(DIE_MCA_MONARCH_LEAVE, "MCA", regs, (long)&nd, 0, recover)
                        == NOTIFY_STOP)
                ia64_mca_spin(__func__);

diff --cc arch/ia64/kernel/setup.c
Simple merge

diff --cc arch/ia64/mm/discontig.c
Simple merge