diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:10:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:10:57 -0500 |
| commit | eb59c505f8a5906ad2e053d14fab50eb8574fd6f (patch) | |
| tree | c6e875adc12b481b916e847e8f80b8881a0fb02c | |
| parent | 1619ed8f60959829d070d8f39cd2f8ca0e7135ce (diff) | |
| parent | c233523b3d392e530033a7587d7970dc62a02361 (diff) | |
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/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
107 files changed, 3249 insertions, 1530 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 33f7327d0451..a1e7f3eec98f 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -85,17 +85,6 @@ Who: Robin Getz <rgetz@blackfin.uclinux.org> & Matt Mackall <mpm@selenic.com> | |||
| 85 | 85 | ||
| 86 | --------------------------- | 86 | --------------------------- |
| 87 | 87 | ||
| 88 | What: Deprecated snapshot ioctls | ||
| 89 | When: 2.6.36 | ||
| 90 | |||
| 91 | Why: The ioctls in kernel/power/user.c were marked as deprecated long time | ||
| 92 | ago. Now they notify users about that so that they need to replace | ||
| 93 | their userspace. After some more time, remove them completely. | ||
| 94 | |||
| 95 | Who: Jiri Slaby <jirislaby@gmail.com> | ||
| 96 | |||
| 97 | --------------------------- | ||
| 98 | |||
| 99 | What: The ieee80211_regdom module parameter | 88 | |