From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jan 2012 21:10:57 +0000 (-0800)
Subject: Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v3.3-rc1~167
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb59c505f8a5906ad2e053d14fab50eb8574fd6f;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'pm-for-linus' of git://git./linux/kernel/git/rafael/linux-pm

* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)
  PM / Hibernate: Implement compat_ioctl for /dev/snapshot
  PM / Freezer: fix return value of freezable_schedule_timeout_killable()
  PM / shmobile: Allow the A4R domain to be turned off at run time
  PM / input / touchscreen: Make st1232 use device PM QoS constraints
  PM / QoS: Introduce dev_pm_qos_add_ancestor_request()
  PM / shmobile: Remove the stay_on flag from SH7372's PM domains
  PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume
  PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode
  PM: Drop generic_subsys_pm_ops
  PM / Sleep: Remove forward-only callbacks from AMBA bus type
  PM / Sleep: Remove forward-only callbacks from platform bus type
  PM: Run the driver callback directly if the subsystem one is not there
  PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers
  PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.
  PM / Sleep: Merge internal functions in generic_ops.c
  PM / Sleep: Simplify generic system suspend callbacks
  PM / Hibernate: Remove deprecated hibernation snapshot ioctls
  PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()
  ARM: S3C64XX: Implement basic power domain support
  PM / shmobile: Use common always on power domain governor
  ...

Fix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused
XBT_FORCE_SLEEP bit
---

eb59c505f8a5906ad2e053d14fab50eb8574fd6f
diff --cc fs/xfs/xfs_buf.c
index 2277bcae395,018829936d6..ce6249dae90
--- a/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))