Daniel Vetter 0d4a42f6bd Merge tag 'v3.9-rc3' into drm-intel-next-queued ...

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

2013-03-19 09:47:30 +01:00

..

autosleep.c

PM: don't use [delayed_]work_pending()

2013-01-26 00:39:11 +01:00

block_io.c

block: kill off REQ_UNPLUG

2011-03-10 08:52:27 +01:00

console.c

PM: make VT switching to the suspend console optional v3

2013-02-20 01:33:41 +01:00

hibernate.c

Merge tag 'pm-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-07-22 13:36:52 -07:00

Kconfig

PM / Domains: Add power off/on function for system core suspend stage

2012-09-04 01:36:01 +02:00

main.c

suspend: enable freeze timeout configuration through sys

2013-02-09 22:32:48 +01:00

Makefile

PM / Sleep: Add user space interface for manipulating wakeup sources, v3

2012-05-01 21:26:05 +02:00

power.h

PM / Hibernate: Enable suspend to both for in-kernel hibernation.

2012-07-01 13:31:22 +02:00

poweroff.c

properly __init-annotate pm_sysrq_init()

2012-09-10 21:21:58 +02:00

process.c

suspend: enable freeze timeout configuration through sys

2013-02-09 22:32:48 +01:00

qos.c

PM: don't use [delayed_]work_pending()

2013-01-26 00:39:11 +01:00

snapshot.c

Merge tag 'pm-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2012-03-21 10:15:51 -07:00

suspend_test.c

driver-core: constify data for class_find_device()

2013-02-06 12:18:56 -08:00

suspend.c

PM: Introduce suspend state PM_SUSPEND_FREEZE

2013-02-09 22:30:44 +01:00

swap.c

PM / Hibernate: use rb_entry

2012-11-15 00:37:08 +01:00

user.c

Make wait_for_device_probe() also do scsi_complete_async_scans()

2012-07-18 18:15:46 -07:00

wakelock.c

PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock

2012-07-19 00:00:58 +02:00