Merge remote-tracking branch 'pm/linux-next'

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc arch/arm/mach-s3c64xx/Kconfig
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/pm.c
index 0868d1331912a53187e897735eaa41f0ac3b3ab1,7d3e81b9dd06229034603aa260064384d8d44a5d..055dac90e0e247c95258ecd412e47bb2297de1cc
--- 1/arch/arm/mach-s3c64xx/pm.c
--- 2/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@@ -181,10 -325,27 +325,29 @@@ static void s3c64xx_pm_prepare(void
        __raw_writel(__raw_readl(S3C64XX_WAKEUP_STAT), S3C64XX_WAKEUP_STAT);
  }
  
- static int s3c64xx_pm_init(void)
+ int __init s3c64xx_pm_init(void)
+ {
+       int i;
+ 
+       s3c_pm_init();
+ 
+       for (i = 0; i < ARRAY_SIZE(s3c64xx_always_on_pm_domains); i++)
+               pm_genpd_init(&s3c64xx_always_on_pm_domains[i]->pd,
+                             &pm_domain_always_on_gov, false);
+ 
+       for (i = 0; i < ARRAY_SIZE(s3c64xx_pm_domains); i++)
+               pm_genpd_init(&s3c64xx_pm_domains[i]->pd, NULL, false);
+ 
+       if (dev_get_platdata(&s3c_device_fb.dev))
+               pm_genpd_add_device(&s3c64xx_pm_f.pd, &s3c_device_fb.dev);
+ 
+       return 0;
+ }
+ 
+ static __init int s3c64xx_pm_initcall(void)
  {
 +      u32 val;
 +
        pm_cpu_prep = s3c64xx_pm_prepare;
        pm_cpu_sleep = s3c64xx_cpu_suspend;
        pm_uart_udivslot = 1;

diff --cc arch/m68k/include/asm/thread_info.h
Simple merge

diff --cc fs/gfs2/log.c
Simple merge

diff --cc fs/gfs2/quota.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/cpu.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc net/sunrpc/sched.c
Simple merge