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

Conflicts:
	fs/xfs/xfs_buf.c

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/btrfs/async-thread.c
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/fs-writeback.c
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
index f84777e3a7f6bd1336d5261429997b786776759a,018829936d6d6a26eea54d0b2bc900b2c70609ca..4dff85c7d7eb1feda7999ff05f9941f6c42077ff
--- 1/fs/xfs/xfs_buf.c
--- 2/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@@ -1701,8 -1701,12 +1701,8 @@@ xfsbufd
                struct list_head tmp;
                struct blk_plug plug;
  
 -              if (unlikely(freezing(current))) {
 -                      set_bit(XBT_FORCE_SLEEP, &target->bt_flags);
 +              if (unlikely(freezing(current)))
-                       refrigerator();
+                       try_to_freeze();
 -              } else {
 -                      clear_bit(XBT_FORCE_SLEEP, &target->bt_flags);
 -              }
  
                /* sleep for a long time if there is nothing to do. */
                if (list_empty(&target->bt_delwri_queue))

diff --cc kernel/fork.c
Simple merge

diff --cc mm/oom_kill.c
Simple merge

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