github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
d0d306e3ac
linux/kernel/power
History
黄涛 7cd3739f32 Merge remote-tracking branch 'linux-2.6.32.y/master' into develop 
Merge Linux 2.6.32.41
Conflicts:
	Makefile
	drivers/mmc/core/core.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/regd_common.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/dma.h
	drivers/net/wireless/b43/sdio.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/cmd.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/usb/serial/option.c
	mm/shmem.c
2011-06-16 11:56:59 +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 earlysuspend: more verbose 2011-01-25 20:08:25 +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 wakelock: port from HTC, dump active wake lock name when unable to suspend 2011-04-23 09:08:19 +08:00
snapshot.c PM / Hibernate: Return error code when alloc_image_page() fails 2011-03-02 09:46:50 -05: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 PM / Hibernate: Fix PM_POST_* notification with user-space suspend 2011-01-07 14:43:06 -08:00
userwakelock.c PM: Add user-space wake lock api. 2010-02-03 21:27:05 -08:00
wakelock.c wakelock: port from HTC, dump active wake lock name when unable to suspend 2011-04-23 09:08:19 +08:00