Jens Axboe b28bc9b38c Linux 3.13-rc6 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJSwLfoAAoJEHm+PkMAQRiGi6QH/1U1B7lmHChDTw3jj1lfm9gA 189Si4QJlnxFWCKHvKEL+pcaVuACU+aMGI8+KyMYK4/JfuWVjjj5fr/SvyHH2/8m LdSK8aHMhJ46uBS4WJ/l6v46qQa5e2vn8RKSBAyKm/h4vpt+hd6zJdoFrFai4th7 k/TAwOAEHI5uzexUChwLlUBRTvbq4U8QUvDu+DeifC8cT63CGaaJ4qVzjOZrx1an eP6UXZrKDASZs7RU950i7xnFVDQu4PsjlZi25udsbeiKcZJgPqGgXz5ULf8ZH8RQ YCi1JOnTJRGGjyIOyLj7pyB01h7XiSM2+eMQ0S7g54F2s7gCJ58c2UwQX45vRWU= =/4/R -----END PGP SIGNATURE----- Merge tag 'v3.13-rc6' into for-3.14/core Needed to bring blk-mq uptodate, since changes have been going in since for-3.14/core was established. Fixup merge issues related to the immutable biovec changes. Signed-off-by: Jens Axboe <axboe@kernel.dk> Conflicts: block/blk-flush.c fs/btrfs/check-integrity.c fs/btrfs/extent_io.c fs/btrfs/scrub.c fs/logfs/dev_bdev.c		2013-12-31 09:51:02 -07:00
..
autosleep.c	PM / Sleep: avoid 'autosleep' in shutdown progress	2013-07-15 01:31:37 +02:00
block_io.c	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
console.c	PM / sleep: Fix memory leak in pm_vt_switch_unregister().	2013-12-22 00:56:35 +01:00
hibernate.c	PM / hibernate: Move software_resume to late_initcall_sync	2013-10-25 01:58:49 +02:00
Kconfig	PM / Sleep: Detect device suspend/resume lockup and log event	2013-10-18 13:33:08 +02:00
main.c	PM / Sleep: Warn about system time after resume with pm_trace	2013-06-27 22:14:46 +02: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	power/sysrq: fix inconstistent help message of sysrq key	2013-04-30 17:04:10 -07:00
process.c	freezer: set PF_SUSPEND_TASK flag on tasks that call freeze_processes	2013-07-30 14:05:06 +02:00
qos.c	PM / QoS: simplify pm_qos_power_write()	2013-10-17 22:52:20 +02:00
snapshot.c	Merge branch 'pm-sleep'	2013-11-19 01:07:08 +01:00
suspend.c	PM / Sleep: increase ftrace coverage in suspend/resume	2013-07-26 00:49:07 +02:00
suspend_test.c	driver-core: constify data for class_find_device()	2013-02-06 12:18:56 -08:00
swap.c	PM / Hibernate: use rb_entry	2012-11-15 00:37:08 +01:00
user.c	Merge branch 'pm-sleep'	2013-11-19 01:07:08 +01:00
wakelock.c	PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock	2012-07-19 00:00:58 +02:00