黄涛 109b0ba094 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb ...

Conflicts:
	Makefile
	drivers/net/tun.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/usb/core/hub.c
	sound/soc/codecs/wm8994.c

2012-08-21 13:11:48 +08:00

..

block_io.c

block: kill off REQ_UNPLUG

2011-03-10 08:52:27 +01: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

2011-06-14 09:08:43 -07:00

earlysuspend.c

rk: earlysuspend: only works on system is running

2012-05-31 09:43:26 +08:00

fbearlysuspend.c

PM: earlysuspend: Removing dependence on console.

2011-06-14 09:08:43 -07:00

hibernate.c

ftrace: Disable function tracing during suspend/resume and hibernation, again

2012-08-09 08:27:35 -07:00

Kconfig

cpu_pm: Add cpu power management notifiers

2012-02-22 14:09:44 +08:00

main.c

PM: Add user-space wake lock api.

2011-06-14 09:08:42 -07:00

Makefile

power: Add option to log time spent in suspend

2011-07-20 15:40:48 -07:00

power.h

power: fix lcd resume taking long time with an ongoing file copy

2011-12-28 14:46:00 +08:00

poweroff.c

Input: sysrq - drop tty argument from sysrq ops handlers

2010-08-19 22:07:06 -07:00

process.c

power: fix lcd resume taking long time with an ongoing file copy

2011-12-28 14:46:00 +08:00

snapshot.c

PM / Hibernate: Fix free_unnecessary_pages()

2011-07-06 20:15:23 +02:00

suspend_test.c

PM: Make warning in suspend_test_finish() less likely to happen

2009-10-22 08:23:45 +09:00

suspend_time.c

power: Add option to log time spent in suspend

2011-07-20 15:40:48 -07:00

suspend.c

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

2012-08-21 13:11:48 +08:00

swap.c

Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block

2011-01-13 10:45:01 -08:00

user.c

PM: Free memory bitmaps if opening /dev/snapshot fails

2011-06-21 23:20:06 +02:00

userwakelock.c

PM: Add user-space wake lock api.

2011-06-14 09:08:42 -07:00

wakelock.c

power: fix lcd resume taking long time with an ongoing file copy

2011-12-28 14:46:00 +08:00