Zhang Sanshan a8758dc110 Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into aosp android-4.1 ...

Conflicts:
	drivers/mmc/core/core.c
	drivers/usb/gadget/configfs.c

2015-12-16 12:30:09 +08:00

..

autosleep.c

…

block_io.c

…

console.c

…

hibernate.c

PM / Hibernate: Migrate to ktime_t

2014-11-03 01:02:55 +01:00

Kconfig

Merge remote-tracking branch 'fsl-linux-sdk/imx_4.1.y' into aosp android-4.1

2015-12-16 12:30:09 +08:00

main.c

PM / sleep: add pm-trace support for suspending phase

2015-03-18 15:54:27 +01:00

Makefile

Power: add an API to log wakeup reasons

2015-11-19 12:38:28 -08:00

power.h

PM / Hibernate: Migrate to ktime_t

2014-11-03 01:02:55 +01:00

poweroff.c

…

process.c

Make suspend abort reason logging depend on CONFIG_PM_SLEEP

2015-11-19 12:38:33 -08:00

qos.c

PM / QoS: Add debugfs support to view the list of constraints

2015-01-23 22:16:21 +01:00

snapshot.c

Revert "PM / hibernate: avoid unsafe pages in e820 reserved regions"

2015-04-07 01:13:23 +02:00

suspend_test.c

PM / sleep: Enhance test_suspend option with repeat capability

2014-09-09 01:48:02 +02:00

suspend_time.c

power: Add option to log time spent in suspend

2015-11-19 12:38:27 -08:00

suspend.c

suspend: Return error when pending wakeup source is found.

2015-11-19 12:38:35 -08:00

swap.c

PM / hibernate: Deletion of an unnecessary check before the function call "vfree"

2014-11-18 02:49:40 +01:00

user.c

PM / hibernate: introduce "nohibernate" boot parameter

2014-06-16 23:29:39 +02:00

wakelock.c

…

wakeup_reason.c

wakeup_reason: use vsnprintf instead of snsprintf for vargs.

2015-11-19 12:38:36 -08:00