黄涛 30be6d7972 Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb ... Conflicts: drivers/cpufreq/cpufreq_interactive.c drivers/misc/pmem.c drivers/net/usb/asix.c drivers/net/wireless/ath/ath9k/ani.c drivers/net/wireless/ath/ath9k/ar5008_phy.c drivers/net/wireless/ath/ath9k/ar9002_hw.c drivers/net/wireless/ath/ath9k/ar9003_calib.c drivers/net/wireless/ath/ath9k/ar9003_mac.c drivers/net/wireless/ath/ath9k/ar9003_phy.h drivers/net/wireless/ath/ath9k/calib.c drivers/net/wireless/ath/ath9k/hif_usb.c drivers/net/wireless/ath/ath9k/hw.c drivers/net/wireless/ath/ath9k/hw.h drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/rc.c drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/b43/main.c drivers/net/wireless/bcm4319/aiutils.c drivers/net/wireless/bcm4319/bcmsdh.c drivers/net/wireless/bcm4319/bcmsdh_linux.c drivers/net/wireless/bcm4319/bcmsdh_sdmmc.c drivers/net/wireless/bcm4319/bcmsdh_sdmmc_linux.c drivers/net/wireless/bcm4319/bcmutils.c drivers/net/wireless/bcm4319/dhd_common.c drivers/net/wireless/bcm4319/dhd_proto.h drivers/net/wireless/bcm4319/dhd_sdio.c drivers/net/wireless/bcm4319/hndpmu.c drivers/net/wireless/bcm4319/include/aidmp.h drivers/net/wireless/bcm4319/include/bcmcdc.h drivers/net/wireless/bcm4319/include/bcmdefs.h drivers/net/wireless/bcm4319/include/bcmdevs.h drivers/net/wireless/bcm4319/include/bcmendian.h drivers/net/wireless/bcm4319/include/bcmpcispi.h drivers/net/wireless/bcm4319/include/bcmperf.h drivers/net/wireless/bcm4319/include/bcmsdbus.h drivers/net/wireless/bcm4319/include/bcmsdh.h drivers/net/wireless/bcm4319/include/bcmsdh_sdmmc.h drivers/net/wireless/bcm4319/include/bcmsdpcm.h drivers/net/wireless/bcm4319/include/bcmsdspi.h drivers/net/wireless/bcm4319/include/bcmsdstd.h drivers/net/wireless/bcm4319/include/bcmspi.h drivers/net/wireless/bcm4319/include/bcmutils.h drivers/net/wireless/bcm4319/include/bcmwifi.h drivers/net/wireless/bcm4319/include/dhdioctl.h drivers/net/wireless/bcm4319/include/epivers.h drivers/net/wireless/bcm4319/include/hndpmu.h drivers/net/wireless/bcm4319/include/hndrte_armtrap.h drivers/net/wireless/bcm4319/include/hndrte_cons.h drivers/net/wireless/bcm4319/include/hndsoc.h drivers/net/wireless/bcm4319/include/linux_osl.h drivers/net/wireless/bcm4319/include/linuxver.h drivers/net/wireless/bcm4319/include/miniopt.h drivers/net/wireless/bcm4319/include/msgtrace.h drivers/net/wireless/bcm4319/include/osl.h drivers/net/wireless/bcm4319/include/packed_section_end.h drivers/net/wireless/bcm4319/include/packed_section_start.h drivers/net/wireless/bcm4319/include/pcicfg.h drivers/net/wireless/bcm4319/include/proto/802.11e.h drivers/net/wireless/bcm4319/include/proto/802.1d.h drivers/net/wireless/bcm4319/include/proto/bcmeth.h drivers/net/wireless/bcm4319/include/proto/bcmevent.h drivers/net/wireless/bcm4319/include/proto/bcmip.h drivers/net/wireless/bcm4319/include/proto/eapol.h drivers/net/wireless/bcm4319/include/proto/ethernet.h drivers/net/wireless/bcm4319/include/proto/sdspi.h drivers/net/wireless/bcm4319/include/proto/vlan.h drivers/net/wireless/bcm4319/include/proto/wpa.h drivers/net/wireless/bcm4319/include/sbchipc.h drivers/net/wireless/bcm4319/include/sbconfig.h drivers/net/wireless/bcm4319/include/sbhnddma.h drivers/net/wireless/bcm4319/include/sbpcmcia.h drivers/net/wireless/bcm4319/include/sbsdio.h drivers/net/wireless/bcm4319/include/sbsdpcmdev.h drivers/net/wireless/bcm4319/include/sbsocram.h drivers/net/wireless/bcm4319/include/sdio.h drivers/net/wireless/bcm4319/include/sdioh.h drivers/net/wireless/bcm4319/include/sdiovar.h drivers/net/wireless/bcm4319/include/siutils.h drivers/net/wireless/bcm4319/include/trxhdr.h drivers/net/wireless/bcm4319/include/typedefs.h drivers/net/wireless/bcm4319/siutils.c drivers/net/wireless/bcm4319/wl_iw.c drivers/net/wireless/bcm4319/wl_iw.h drivers/net/wireless/bcmdhd/Kconfig drivers/net/wireless/bcmdhd/Makefile drivers/net/wireless/bcmdhd/bcmevent.c drivers/net/wireless/bcmdhd/dhd.h drivers/net/wireless/bcmdhd/dhd_cdc.c drivers/net/wireless/bcmdhd/dhd_linux.c drivers/net/wireless/bcmdhd/dhd_wlfc.h drivers/net/wireless/bcmdhd/include/Makefile drivers/net/wireless/bcmdhd/include/htsf.h drivers/net/wireless/bcmdhd/include/proto/802.11.h drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h drivers/net/wireless/bcmdhd/include/proto/p2p.h drivers/net/wireless/bcmdhd/include/wlfc_proto.h drivers/net/wireless/bcmdhd/include/wlioctl.h drivers/net/wireless/bcmdhd/linux_osl.c drivers/net/wireless/bcmdhd/wl_android.c drivers/net/wireless/bcmdhd/wl_android.h drivers/net/wireless/bcmdhd/wl_cfg80211.c drivers/net/wireless/bcmdhd/wl_cfg80211.h drivers/net/wireless/bcmdhd/wl_cfgp2p.c drivers/net/wireless/bcmdhd/wl_cfgp2p.h drivers/net/wireless/bcmdhd/wl_linux_mon.c drivers/net/wireless/bcmdhd/wldev_common.c drivers/net/wireless/bcmdhd/wldev_common.h drivers/net/wireless/ipw2x00/ipw2200.c drivers/net/wireless/iwlwifi/iwl-agn-lib.c drivers/net/wireless/iwlwifi/iwl-agn-tx.c drivers/net/wireless/iwlwifi/iwl-agn-ucode.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-agn.h drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-hcmd.c drivers/net/wireless/iwlwifi/iwl-rx.c drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/libertas/if_spi.c drivers/net/wireless/p54/p54spi.c drivers/net/wireless/rt2x00/rt2800lib.c drivers/net/wireless/rt2x00/rt2800pci.c drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/rt2x00/rt2x00.h drivers/net/wireless/rt2x00/rt2x00dev.c drivers/net/wireless/rt2x00/rt2x00mac.c drivers/net/wireless/rt2x00/rt2x00queue.c drivers/usb/serial/option.c		2012-07-12 18:08:01 +08:00
..
clock_ops.c	PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset	2011-06-21 23:24:33 +02:00
generic_ops.c	PM: Introduce generic prepare and complete callbacks for subsystems	2011-05-17 23:26:21 +02:00
main.c	drivers/base/power/main.c: port rk29 change to plat rk	2012-04-16 17:48:41 +08:00
Makefile	PM: Remove CONFIG_PM_VERBOSE	2011-05-17 23:25:10 +02:00
opp.c	PM / OPP: opp_find_freq_exact() documentation fix	2011-03-15 00:43:17 +01:00
power.h	PM: Do not create wakeup sysfs files for devices that cannot wake up	2011-03-15 00:43:14 +01:00
runtime.c	Merge linux-stable 3.0.28 into android-3.0	2012-04-19 15:20:03 -07:00
sysfs.c	PM / Wakeup: Fix build warning related to the "wakeup" sysfs file	2011-05-17 23:19:18 +02:00
trace.c	PM: Use appropriate printk() priority level in trace.c	2011-03-15 00:43:14 +01:00
wakeup.c	PM / Wakeup: Remove useless synchronize_rcu() call	2011-05-17 23:19:19 +02:00