linux-uconsole/kernel/power
Colin Cross 3515161181 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
	arch/arm/mm/cache-v6.S

Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
2011-01-07 17:20:53 -08:00
..
block_io.c block: unify flags for struct bio and struct request 2010-08-07 18:20:39 +02:00
console.c vt: introduce and use vt_kmsg_redirect() function 2009-12-15 08:53:28 -08:00
consoleearlysuspend.c consoleearlysuspend: Fix for 2.6.32 2010-09-29 17:49:08 -07:00
earlysuspend.c PM: Implement early suspend api 2010-09-29 17:49:07 -07:00
fbearlysuspend.c PM: earlysuspend: Removing dependence on console. 2010-09-29 17:49:08 -07:00
hibernate.c PM / Hibernate: Fix memory corruption related to swap 2010-12-09 13:33:26 -08:00
Kconfig PM: earlysuspend: Removing dependence on console. 2010-09-29 17:49:08 -07:00
main.c PM: Add user-space wake lock api. 2010-09-29 17:49:07 -07:00
Makefile PM: earlysuspend: Removing dependence on console. 2010-09-29 17:49:08 -07:00
nvs.c suspend: Move NVS save/restore code to generic suspend functionality 2010-06-10 11:02:34 -04:00
power.h PM: Add user-space wake lock api. 2010-09-29 17:49:07 -07:00
poweroff.c Input: sysrq - drop tty argument from sysrq ops handlers 2010-08-19 22:07:06 -07:00
process.c PM: wakelock: Don't dump unfrozen task list when aborting try_to_freeze_tasks after less than one second 2010-09-29 17:49:07 -07:00
snapshot.c Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 2010-09-11 15:50:53 -07:00
suspend.c Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2010-12-21 18:38:13 -08:00
suspend_test.c PM: Make warning in suspend_test_finish() less likely to happen 2009-10-22 08:23:45 +09:00
swap.c swap: revert special hibernation allocation 2010-09-09 18:57:25 -07:00
user.c PM / Hibernate: Fix PM_POST_* notification with user-space suspend 2011-01-07 13:58:19 -08:00
userwakelock.c PM: Add user-space wake lock api. 2010-09-29 17:49:07 -07:00
wakelock.c power: wakelock: call __get_wall_to_monotonic() instead of using wall_to_monotonic 2010-09-29 17:49:47 -07:00