Merge branch 'akpm-current/current'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/platform/ce4100/ce4100.c
index 643b8b5eee86b3eee7edb2cf99dfa31ad7f9318d,d62e74d48f55ad2cc83c97da6cc3a1c70d39fed1..8244f5ec2f4c7520284ff2388c328a17c10e3440
--- 1/arch/x86/platform/ce4100/ce4100.c
--- 2/arch/x86/platform/ce4100/ce4100.c
+++ b/arch/x86/platform/ce4100/ce4100.c
@@@ -12,9 -12,9 +12,10 @@@
  #include <linux/kernel.h>
  #include <linux/irq.h>
  #include <linux/module.h>
+ #include <linux/reboot.h>
  #include <linux/serial_reg.h>
  #include <linux/serial_8250.h>
 +#include <linux/reboot.h>
  
  #include <asm/ce4100.h>
  #include <asm/prom.h>

diff --cc arch/x86/platform/efi/efi.c
Simple merge

diff --cc drivers/thermal/x86_pkg_temp_thermal.c
Simple merge

diff --cc fs/binfmt_elf.c
Simple merge

diff --cc kernel/printk/printk.c
Simple merge