Merge Paulus' tree

diff --combined arch/powerpc/platforms/iseries/lpardata.c
index 608431a226077b955bf56f147c4fe207164da147,e856947bd16da4f8e1b35e858fd03d5ef0889c31..bb8c91537f35f7f6df54be8724f3b1044267746d
--- 1/arch/powerpc/platforms/iseries/lpardata.c
--- 2/arch/powerpc/platforms/iseries/lpardata.c
+++ b/arch/powerpc/platforms/iseries/lpardata.c
@@@ -13,16 -13,16 +13,16 @@@
  #include <linux/bitops.h>
  #include <asm/processor.h>
  #include <asm/ptrace.h>
- #include <asm/naca.h>
  #include <asm/abs_addr.h>
 -#include <asm/iSeries/ItLpNaca.h>
 +#include <asm/iseries/it_lp_naca.h>
  #include <asm/lppaca.h>
 -#include <asm/iSeries/ItLpRegSave.h>
 +#include <asm/iseries/it_lp_reg_save.h>
  #include <asm/paca.h>
 -#include <asm/iSeries/LparMap.h>
 -#include <asm/iSeries/ItExtVpdPanel.h>
 -#include <asm/iSeries/ItLpQueue.h>
 +#include <asm/iseries/lpar_map.h>
 +#include <asm/iseries/it_exp_vpd_panel.h>
 +#include <asm/iseries/it_lp_queue.h>
  
+ #include "naca.h"
  #include "vpd_areas.h"
  #include "spcomm_area.h"
  #include "ipl_parms.h"

diff --combined arch/powerpc/platforms/iseries/setup.c
index 8e5ef62715bb28e24f630a468baadc9ca2dca16b,7bc19a594cc68bd7835aa1a72c39edbbd7632482..fda712b421687f2b910dbc99c47de85644449057
--- 1/arch/powerpc/platforms/iseries/setup.c
--- 2/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@@ -41,19 -41,19 +41,19 @@@
  #include <asm/firmware.h>
  
  #include <asm/time.h>
- #include <asm/naca.h>
  #include <asm/paca.h>
  #include <asm/cache.h>
  #include <asm/sections.h>
  #include <asm/abs_addr.h>
 -#include <asm/iSeries/HvLpConfig.h>
 -#include <asm/iSeries/HvCallEvent.h>
 -#include <asm/iSeries/HvCallXm.h>
 -#include <asm/iSeries/ItLpQueue.h>
 -#include <asm/iSeries/mf.h>
 -#include <asm/iSeries/HvLpEvent.h>
 -#include <asm/iSeries/LparMap.h>
 +#include <asm/iseries/hv_lp_config.h>
 +#include <asm/iseries/hv_call_event.h>
 +#include <asm/iseries/hv_call_xm.h>
 +#include <asm/iseries/it_lp_queue.h>
 +#include <asm/iseries/mf.h>
 +#include <asm/iseries/hv_lp_event.h>
 +#include <asm/iseries/lpar_map.h>
  
+ #include "naca.h"
  #include "setup.h"
  #include "irq.h"
  #include "vpd_areas.h"