forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/kernel/power
History
黄涛 35b9b535e7 Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 
This reverts commit 6e2688ca84, reversing
changes made to 4b7c9de4de.

Conflicts:

	drivers/gpio/wm831x-gpio.c
	drivers/i2c/busses/Kconfig
	drivers/net/dm9000.c
	drivers/net/wireless/airo.c
	drivers/net/wireless/ath/ar9170/hw.h
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/net/wireless/ath/ath5k/ath5k.h
	drivers/net/wireless/ath/ath5k/attach.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath5k/qcu.c
	drivers/net/wireless/ath/ath5k/reset.c
	drivers/net/wireless/ath/ath9k/ath9k.h
	drivers/net/wireless/ath/ath9k/beacon.c
	drivers/net/wireless/ath/ath9k/eeprom.h
	drivers/net/wireless/ath/ath9k/eeprom_def.c
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/initvals.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/pci.c
	drivers/net/wireless/ath/ath9k/phy.h
	drivers/net/wireless/ath/ath9k/rc.c
	drivers/net/wireless/ath/ath9k/xmit.c
	drivers/net/wireless/ath/regd.h
	drivers/net/wireless/b43/Kconfig
	drivers/net/wireless/b43/Makefile
	drivers/net/wireless/b43/b43.h
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/b43/pio.c
	drivers/net/wireless/b43/pio.h
	drivers/net/wireless/b43/xmit.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/hostap/hostap_cs.c
	drivers/net/wireless/hostap/hostap_hw.c
	drivers/net/wireless/hostap/hostap_pci.c
	drivers/net/wireless/hostap/hostap_wlan.h
	drivers/net/wireless/iwlwifi/iwl-3945.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-dev.h
	drivers/net/wireless/iwlwifi/iwl-helpers.h
	drivers/net/wireless/iwlwifi/iwl-rx.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
	drivers/net/wireless/libertas/if_sdio1.c
	drivers/net/wireless/p54/eeprom.c
	drivers/net/wireless/p54/p54pci.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/p54/txrx.c
	drivers/net/wireless/rndis_wlan.c
	drivers/net/wireless/rtl818x/rtl8180_dev.c
	drivers/net/wireless/wl12xx/wl1251_debugfs.c
	drivers/net/wireless/wl12xx/wl1251_sdio.c
	drivers/usb/serial/option.c
	net/bluetooth/rfcomm/core.c
2011-07-30 16:24:52 +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.c PM / Hibernate: Fix blkdev refleaks 2009-11-03 11:01:46 +01:00
hibernate_nvs.c PM/Hibernate: Move NVS routines into a seperate file (v2). 2009-06-12 21:32:33 +02: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 Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:24:52 +08:00
snapshot.c Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:24:52 +08:00
suspend.c PM: Enable early suspend through /sys/power/state 2010-02-03 21:27:05 -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 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 Revert "Merge remote branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:11:20 +08:00
userwakelock.c PM: Add user-space wake lock api. 2010-02-03 21:27:05 -08:00
wakelock.c temp revert wakelock change 2011-07-30 15:26:02 +08:00