黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop ...

Conflicts:
	drivers/i2c/busses/Kconfig
	drivers/net/dm9000.c
	drivers/net/wireless/libertas/if_sdio1.c
	drivers/usb/serial/option.c
	net/bluetooth/rfcomm/core.c

2010-12-16 20:54:24 +08:00

..

console.c

vt: remove power stuff from kernel/power

2009-09-19 13:13:25 -07:00

consoleearlysuspend.c

consoleearlysuspend: Fix for 2.6.32

2010-02-03 21:27:08 -08:00

earlysuspend.c

PM: Implement early suspend api

2010-02-03 21:27:04 -08:00

fbearlysuspend.c

PM: earlysuspend: Removing dependence on console.

2010-02-03 21:27:08 -08:00

hibernate_nvs.c

PM/Hibernate: Move NVS routines into a seperate file (v2).

2009-06-12 21:32:33 +02:00

hibernate.c

PM / Hibernate: Fix blkdev refleaks

2009-11-03 11:01:46 +01:00

Kconfig

PM: earlysuspend: Removing dependence on console.

2010-02-03 21:27:08 -08:00

main.c

PM: Add user-space wake lock api.

2010-02-03 21:27:05 -08:00

Makefile

PM: earlysuspend: Removing dependence on console.

2010-02-03 21:27:08 -08:00

power.h

PM: Add user-space wake lock api.

2010-02-03 21:27:05 -08:00

poweroff.c

trivial: kernel/power/poweroff.c: whitespace fix

2009-06-12 18:01:46 +02:00

process.c

Merge remote branch 'linux-2.6.32.y/master' into develop

2010-12-16 20:54:24 +08:00

snapshot.c

PM / Hibernate: Fix preallocating of memory

2010-03-15 08:49:46 -07:00

suspend_test.c

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

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

suspend.c

PM: Enable early suspend through /sys/power/state

2010-02-03 21:27:05 -08:00

swap.c

PM / Hibernate: Add newline to load_image() fail path

2009-11-03 11:03:09 +01:00

swsusp.c

PM/Hibernate: Move NVS routines into a seperate file (v2).

2009-06-12 21:32:33 +02:00

user.c

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

userwakelock.c

PM: Add user-space wake lock api.

2010-02-03 21:27:05 -08:00

wakelock.c

power: wakelock: Print active wakelocks when has_wake_lock() is called

2010-02-19 17:03:09 -08:00