Revert "temp revert msdos change"

This reverts commit 8937476fff671d634c8b8df256d824fce0e60746.

Revert "temp revert timed_gpio change"

This reverts commit f65181d5edaa1f3e514eb0eb8f51c4dd9451baac.

Revert "temp revert earlysuspend change"

This reverts commit 101904dc5c63e91d795a588ea23e8b21395ebdb0.

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2.6.36

Conflicts:
drivers/mmc/host/sdhci-tegra.c
drivers/net/wireless/bcm4329/dhd_common.c
drivers/net/wireless/bcm4329/dhd_custom_gpio.c

Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into develop-2.6.36

Conflicts:
Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/common/Kconfig
arch/arm/common/Makefile
arch/arm/common/pl330.c
arch/arm/include/asm/dma.h
arch/arm/include/asm/memory.h
arch/arm/kernel/Makefile
arch/arm/kernel/dma.c
arch/arm/kernel/process.c
arch/arm/mm/Kconfig
arch/arm/mm/mmu.c
arch/arm/mm/proc-v7.S
arch/arm/oprofile/op_model_v7.c
arch/arm/tools/mach-types
block/blk-core.c
drivers/base/firmware_class.c
drivers/base/platform.c
drivers/bluetooth/Kconfig
drivers/bluetooth/hci_h4.c
drivers/char/Makefile
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/gpiolib.c
drivers/gpio/wm831x-gpio.c
drivers/gpio/wm8994-gpio.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/i2c/i2c-core.c
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/input/keyboard/matrix_keypad.c
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/misc/wm831x-on.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/media/video/Kconfig
drivers/media/video/Makefile
drivers/media/video/soc_camera.c
drivers/media/video/uvc/uvc_queue.c
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/wm831x-core.c
drivers/mfd/wm831x-irq.c
drivers/mfd/wm8994-core.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/core/sdio_io.c
drivers/mtd/mtd_blkdevs.c
drivers/mtd/mtdblock.c
drivers/mtd/nand/Makefile
drivers/net/dm9000.c
drivers/net/irda/Kconfig
drivers/net/usb/Kconfig
drivers/net/usb/Makefile
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile
drivers/net/wireless/adm8211.c
drivers/net/wireless/adm8211.h
drivers/net/wireless/airo.c
drivers/net/wireless/airo_cs.c
drivers/net/wireless/at76c50x-usb.c
drivers/net/wireless/at76c50x-usb.h
drivers/net/wireless/ath/Kconfig
drivers/net/wireless/ath/Makefile
drivers/net/wireless/ath/ar9170/Kconfig
drivers/net/wireless/ath/ar9170/ar9170.h
drivers/net/wireless/ath/ar9170/cmd.c
drivers/net/wireless/ath/ar9170/cmd.h
drivers/net/wireless/ath/ar9170/eeprom.h
drivers/net/wireless/ath/ar9170/hw.h
drivers/net/wireless/ath/ar9170/led.c
drivers/net/wireless/ath/ar9170/mac.c
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/phy.c
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/ath/ar9170/usb.h
drivers/net/wireless/ath/ath.h
drivers/net/wireless/ath/ath5k/Kconfig
drivers/net/wireless/ath/ath5k/Makefile
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/base.h
drivers/net/wireless/ath/ath5k/caps.c
drivers/net/wireless/ath/ath5k/debug.c
drivers/net/wireless/ath/ath5k/debug.h
drivers/net/wireless/ath/ath5k/desc.c
drivers/net/wireless/ath/ath5k/desc.h
drivers/net/wireless/ath/ath5k/dma.c
drivers/net/wireless/ath/ath5k/eeprom.c
drivers/net/wireless/ath/ath5k/eeprom.h
drivers/net/wireless/ath/ath5k/gpio.c
drivers/net/wireless/ath/ath5k/initvals.c
drivers/net/wireless/ath/ath5k/led.c
drivers/net/wireless/ath/ath5k/pcu.c
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/ath/ath5k/qcu.c
drivers/net/wireless/ath/ath5k/reg.h
drivers/net/wireless/ath/ath5k/reset.c
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/wireless/ath/ath9k/Makefile
drivers/net/wireless/ath/ath9k/ahb.c
drivers/net/wireless/ath/ath9k/ani.c
drivers/net/wireless/ath/ath9k/ani.h
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/beacon.c
drivers/net/wireless/ath/ath9k/btcoex.c
drivers/net/wireless/ath/ath9k/btcoex.h
drivers/net/wireless/ath/ath9k/calib.c
drivers/net/wireless/ath/ath9k/calib.h
drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/debug.h
drivers/net/wireless/ath/ath9k/eeprom.c
drivers/net/wireless/ath/ath9k/eeprom.h
drivers/net/wireless/ath/ath9k/eeprom_4k.c
drivers/net/wireless/ath/ath9k/eeprom_9287.c
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/mac.c
drivers/net/wireless/ath/ath9k/mac.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/rc.h
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/reg.h
drivers/net/wireless/ath/ath9k/virtual.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/ath/regd.c
drivers/net/wireless/ath/regd.h
drivers/net/wireless/ath/regd_common.h
drivers/net/wireless/atmel.c
drivers/net/wireless/atmel_cs.c
drivers/net/wireless/atmel_pci.c
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/dma.h
drivers/net/wireless/b43/leds.c
drivers/net/wireless/b43/lo.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/pcmcia.c
drivers/net/wireless/b43/phy_a.c
drivers/net/wireless/b43/phy_common.c
drivers/net/wireless/b43/phy_common.h
drivers/net/wireless/b43/phy_g.c
drivers/net/wireless/b43/phy_lp.c
drivers/net/wireless/b43/phy_lp.h
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/b43/phy_n.h
drivers/net/wireless/b43/pio.c
drivers/net/wireless/b43/pio.h
drivers/net/wireless/b43/rfkill.c
drivers/net/wireless/b43/sdio.c
drivers/net/wireless/b43/tables_nphy.c
drivers/net/wireless/b43/tables_nphy.h
drivers/net/wireless/b43/wa.c
drivers/net/wireless/b43/xmit.c
drivers/net/wireless/b43/xmit.h
drivers/net/wireless/b43legacy/Kconfig
drivers/net/wireless/b43legacy/b43legacy.h
drivers/net/wireless/b43legacy/dma.c
drivers/net/wireless/b43legacy/dma.h
drivers/net/wireless/b43legacy/leds.h
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/b43legacy/phy.c
drivers/net/wireless/b43legacy/pio.c
drivers/net/wireless/b43legacy/pio.h
drivers/net/wireless/b43legacy/rfkill.c
drivers/net/wireless/b43legacy/xmit.c
drivers/net/wireless/b43legacy/xmit.h
drivers/net/wireless/bcm4329/Kconfig
drivers/net/wireless/bcm4329/Makefile
drivers/net/wireless/bcm4329/bcmsdh_linux.c
drivers/net/wireless/bcm4329/bcmsdh_sdmmc_linux.c
drivers/net/wireless/bcm4329/dhd.h
drivers/net/wireless/bcm4329/dhd_cdc.c
drivers/net/wireless/bcm4329/dhd_common.c
drivers/net/wireless/bcm4329/dhd_custom_gpio.c
drivers/net/wireless/bcm4329/dhd_linux.c
drivers/net/wireless/bcm4329/dhd_sdio.c
drivers/net/wireless/bcm4329/include/epivers.h
drivers/net/wireless/bcm4329/include/wlioctl.h
drivers/net/wireless/bcm4329/linux_osl.c
drivers/net/wireless/bcm4329/wl_iw.c
drivers/net/wireless/bcm4329/wl_iw.h
drivers/net/wireless/hostap/Kconfig
drivers/net/wireless/hostap/hostap_80211.h
drivers/net/wireless/hostap/hostap_80211_rx.c
drivers/net/wireless/hostap/hostap_80211_tx.c
drivers/net/wireless/hostap/hostap_ap.c
drivers/net/wireless/hostap/hostap_common.h
drivers/net/wireless/hostap/hostap_cs.c
drivers/net/wireless/hostap/hostap_download.c
drivers/net/wireless/hostap/hostap_hw.c
drivers/net/wireless/hostap/hostap_info.c
drivers/net/wireless/hostap/hostap_ioctl.c
drivers/net/wireless/hostap/hostap_main.c
drivers/net/wireless/hostap/hostap_pci.c
drivers/net/wireless/hostap/hostap_plx.c
drivers/net/wireless/hostap/hostap_wlan.h
drivers/net/wireless/ipw2x00/Kconfig
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2100.h
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2x00/ipw2200.h
drivers/net/wireless/ipw2x00/libipw.h
drivers/net/wireless/ipw2x00/libipw_geo.c
drivers/net/wireless/ipw2x00/libipw_module.c
drivers/net/wireless/ipw2x00/libipw_rx.c
drivers/net/wireless/ipw2x00/libipw_tx.c
drivers/net/wireless/ipw2x00/libipw_wx.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/Makefile
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-3945-fh.h
drivers/net/wireless/iwlwifi/iwl-3945-hw.h
drivers/net/wireless/iwlwifi/iwl-3945-led.c
drivers/net/wireless/iwlwifi/iwl-3945-led.h
drivers/net/wireless/iwlwifi/iwl-3945-rs.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-4965-hw.h
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000-hw.h
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-6000-hw.h
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.h
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-calib.h
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-csr.h
drivers/net/wireless/iwlwifi/iwl-debug.h
drivers/net/wireless/iwlwifi/iwl-debugfs.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-eeprom.c
drivers/net/wireless/iwlwifi/iwl-eeprom.h
drivers/net/wireless/iwlwifi/iwl-fh.h
drivers/net/wireless/iwlwifi/iwl-hcmd.c
drivers/net/wireless/iwlwifi/iwl-helpers.h
drivers/net/wireless/iwlwifi/iwl-io.h
drivers/net/wireless/iwlwifi/iwl-led.c
drivers/net/wireless/iwlwifi/iwl-led.h
drivers/net/wireless/iwlwifi/iwl-power.c
drivers/net/wireless/iwlwifi/iwl-power.h
drivers/net/wireless/iwlwifi/iwl-prph.h
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-spectrum.h
drivers/net/wireless/iwlwifi/iwl-sta.c
drivers/net/wireless/iwlwifi/iwl-sta.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwmc3200wifi/Kconfig
drivers/net/wireless/iwmc3200wifi/Makefile
drivers/net/wireless/iwmc3200wifi/bus.h
drivers/net/wireless/iwmc3200wifi/cfg80211.c
drivers/net/wireless/iwmc3200wifi/commands.c
drivers/net/wireless/iwmc3200wifi/commands.h
drivers/net/wireless/iwmc3200wifi/debug.h
drivers/net/wireless/iwmc3200wifi/debugfs.c
drivers/net/wireless/iwmc3200wifi/eeprom.c
drivers/net/wireless/iwmc3200wifi/eeprom.h
drivers/net/wireless/iwmc3200wifi/fw.c
drivers/net/wireless/iwmc3200wifi/hal.c
drivers/net/wireless/iwmc3200wifi/hal.h
drivers/net/wireless/iwmc3200wifi/iwm.h
drivers/net/wireless/iwmc3200wifi/lmac.h
drivers/net/wireless/iwmc3200wifi/main.c
drivers/net/wireless/iwmc3200wifi/netdev.c
drivers/net/wireless/iwmc3200wifi/rx.c
drivers/net/wireless/iwmc3200wifi/sdio.c
drivers/net/wireless/iwmc3200wifi/tx.c
drivers/net/wireless/iwmc3200wifi/umac.h
drivers/net/wireless/libertas/Makefile
drivers/net/wireless/libertas/README
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/cmd.h
drivers/net/wireless/libertas/cmdresp.c
drivers/net/wireless/libertas/debugfs.c
drivers/net/wireless/libertas/decl.h
drivers/net/wireless/libertas/defs.h
drivers/net/wireless/libertas/dev.h
drivers/net/wireless/libertas/ethtool.c
drivers/net/wireless/libertas/host.h
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/libertas/if_sdio.c
drivers/net/wireless/libertas/if_sdio.h
drivers/net/wireless/libertas/if_spi.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/radiotap.h
drivers/net/wireless/libertas/rx.c
drivers/net/wireless/libertas/tx.c
drivers/net/wireless/libertas/types.h
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/if_usb.c
drivers/net/wireless/libertas_tf/libertas_tf.h
drivers/net/wireless/libertas_tf/main.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mv8686/scan.h
drivers/net/wireless/mv8686/wext.h
drivers/net/wireless/mwl8k.c
drivers/net/wireless/orinoco/Kconfig
drivers/net/wireless/orinoco/Makefile
drivers/net/wireless/orinoco/airport.c
drivers/net/wireless/orinoco/cfg.c
drivers/net/wireless/orinoco/fw.c
drivers/net/wireless/orinoco/hermes.c
drivers/net/wireless/orinoco/hermes.h
drivers/net/wireless/orinoco/hermes_dld.c
drivers/net/wireless/orinoco/hw.c
drivers/net/wireless/orinoco/hw.h
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/main.h
drivers/net/wireless/orinoco/orinoco.h
drivers/net/wireless/orinoco/orinoco_cs.c
drivers/net/wireless/orinoco/orinoco_nortel.c
drivers/net/wireless/orinoco/orinoco_pci.c
drivers/net/wireless/orinoco/orinoco_plx.c
drivers/net/wireless/orinoco/orinoco_tmd.c
drivers/net/wireless/orinoco/scan.c
drivers/net/wireless/orinoco/spectrum_cs.c
drivers/net/wireless/orinoco/wext.c
drivers/net/wireless/p54/Kconfig
drivers/net/wireless/p54/eeprom.c
drivers/net/wireless/p54/fwio.c
drivers/net/wireless/p54/led.c
drivers/net/wireless/p54/main.c
drivers/net/wireless/p54/net2280.h
drivers/net/wireless/p54/p54.h
drivers/net/wireless/p54/p54pci.c
drivers/net/wireless/p54/p54pci.h
drivers/net/wireless/p54/p54spi.c
drivers/net/wireless/p54/p54spi.h
drivers/net/wireless/p54/p54usb.c
drivers/net/wireless/p54/p54usb.h
drivers/net/wireless/p54/txrx.c
drivers/net/wireless/prism54/isl_ioctl.c
drivers/net/wireless/prism54/isl_oid.h
drivers/net/wireless/prism54/islpci_dev.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/net/wireless/prism54/islpci_eth.h
drivers/net/wireless/prism54/islpci_hotplug.c
drivers/net/wireless/prism54/islpci_mgt.c
drivers/net/wireless/prism54/islpci_mgt.h
drivers/net/wireless/prism54/oid_mgt.c
drivers/net/wireless/ray_cs.c
drivers/net/wireless/ray_cs.h
drivers/net/wireless/rndis_wlan.c
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/Makefile
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2400pci.h
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500pci.h
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt2500usb.h
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2800usb.h
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00config.c
drivers/net/wireless/rt2x00/rt2x00crypto.c
drivers/net/wireless/rt2x00/rt2x00debug.c
drivers/net/wireless/rt2x00/rt2x00debug.h
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00dump.h
drivers/net/wireless/rt2x00/rt2x00firmware.c
drivers/net/wireless/rt2x00/rt2x00ht.c
drivers/net/wireless/rt2x00/rt2x00leds.c
drivers/net/wireless/rt2x00/rt2x00leds.h
drivers/net/wireless/rt2x00/rt2x00lib.h
drivers/net/wireless/rt2x00/rt2x00link.c
drivers/net/wireless/rt2x00/rt2x00mac.c
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/net/wireless/rt2x00/rt2x00pci.h
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt2x00queue.h
drivers/net/wireless/rt2x00/rt2x00reg.h
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/net/wireless/rt2x00/rt2x00usb.h
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt61pci.h
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/rt2x00/rt73usb.h
drivers/net/wireless/rtl818x/rtl8180.h
drivers/net/wireless/rtl818x/rtl8180_dev.c
drivers/net/wireless/rtl818x/rtl8180_grf5101.c
drivers/net/wireless/rtl818x/rtl8180_max2820.c
drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
drivers/net/wireless/rtl818x/rtl8180_sa2400.c
drivers/net/wireless/rtl818x/rtl8187.h
drivers/net/wireless/rtl818x/rtl8187_dev.c
drivers/net/wireless/rtl818x/rtl8187_leds.c
drivers/net/wireless/rtl818x/rtl8187_leds.h
drivers/net/wireless/rtl818x/rtl8187_rfkill.c
drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
drivers/net/wireless/rtl818x/rtl818x.h
drivers/net/wireless/wl12xx/Kconfig
drivers/net/wireless/wl12xx/Makefile
drivers/net/wireless/wl12xx/wl1251.h
drivers/net/wireless/wl12xx/wl1251_acx.c
drivers/net/wireless/wl12xx/wl1251_acx.h
drivers/net/wireless/wl12xx/wl1251_boot.c
drivers/net/wireless/wl12xx/wl1251_cmd.c
drivers/net/wireless/wl12xx/wl1251_cmd.h
drivers/net/wireless/wl12xx/wl1251_debugfs.c
drivers/net/wireless/wl12xx/wl1251_event.c
drivers/net/wireless/wl12xx/wl1251_event.h
drivers/net/wireless/wl12xx/wl1251_init.c
drivers/net/wireless/wl12xx/wl1251_init.h
drivers/net/wireless/wl12xx/wl1251_io.h
drivers/net/wireless/wl12xx/wl1251_main.c
drivers/net/wireless/wl12xx/wl1251_ps.c
drivers/net/wireless/wl12xx/wl1251_ps.h
drivers/net/wireless/wl12xx/wl1251_reg.h
drivers/net/wireless/wl12xx/wl1251_rx.c
drivers/net/wireless/wl12xx/wl1251_rx.h
drivers/net/wireless/wl12xx/wl1251_sdio.c
drivers/net/wireless/wl12xx/wl1251_spi.c
drivers/net/wireless/wl12xx/wl1251_tx.c
drivers/net/wireless/wl12xx/wl1251_tx.h
drivers/net/wireless/wl12xx/wl1271.h
drivers/net/wireless/wl12xx/wl1271_acx.c
drivers/net/wireless/wl12xx/wl1271_acx.h
drivers/net/wireless/wl12xx/wl1271_boot.c
drivers/net/wireless/wl12xx/wl1271_boot.h
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_cmd.h
drivers/net/wireless/wl12xx/wl1271_debugfs.c
drivers/net/wireless/wl12xx/wl1271_event.c
drivers/net/wireless/wl12xx/wl1271_event.h
drivers/net/wireless/wl12xx/wl1271_init.c
drivers/net/wireless/wl12xx/wl1271_init.h
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_ps.c
drivers/net/wireless/wl12xx/wl1271_ps.h
drivers/net/wireless/wl12xx/wl1271_reg.h
drivers/net/wireless/wl12xx/wl1271_rx.c
drivers/net/wireless/wl12xx/wl1271_rx.h
drivers/net/wireless/wl12xx/wl1271_spi.c
drivers/net/wireless/wl12xx/wl1271_tx.c
drivers/net/wireless/wl12xx/wl1271_tx.h
drivers/net/wireless/wl12xx/wl12xx_80211.h
drivers/net/wireless/wl3501.h
drivers/net/wireless/wl3501_cs.c
drivers/net/wireless/zd1201.c
drivers/net/wireless/zd1211rw/Kconfig
drivers/net/wireless/zd1211rw/zd_chip.c
drivers/net/wireless/zd1211rw/zd_chip.h
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/net/wireless/zd1211rw/zd_mac.h
drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
drivers/net/wireless/zd1211rw/zd_usb.c
drivers/net/wireless/zd1211rw/zd_usb.h
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/wm831x_backup.c
drivers/power/wm831x_power.c
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm8994-regulator.c
drivers/rtc/Makefile
drivers/rtc/rtc-wm831x.c
drivers/serial/Kconfig
drivers/spi/Kconfig
drivers/spi/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/dream/Kconfig
drivers/staging/iio/Kconfig
drivers/staging/iio/Makefile
drivers/usb/core/hub.c
drivers/usb/gadget/gadget_chips.h
drivers/video/Kconfig
drivers/video/backlight/Kconfig
drivers/video/backlight/Makefile
drivers/video/backlight/wm831x_bl.c
drivers/watchdog/Kconfig
drivers/watchdog/Makefile
fs/partitions/check.c
include/asm-generic/gpio.h
include/linux/fb.h
include/linux/i82593.h
include/linux/l3g4200d.h
include/linux/mfd/wm831x/core.h
include/linux/mfd/wm831x/pdata.h
include/linux/mfd/wm8994/core.h
include/linux/mfd/wm8994/gpio.h
include/linux/mfd/wm8994/pdata.h
include/linux/mmc/card.h
include/linux/mmc/host.h
include/linux/mtd/nand.h
include/linux/serial_core.h
include/linux/videodev2.h
include/media/v4l2-chip-ident.h
include/sound/soc-dai.h
include/sound/soc-dapm.h
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/wm8900.c
sound/soc/codecs/wm8988.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.h
sound/soc/codecs/wm_hubs.c
sound/soc/soc-dapm.c

Revert "sched: Fix task priority bug"

This reverts commit 18ed2ed46071a47e06820740650686da48e84dbb.

Revert "sysfs: Fix sysfs owner and group."

This reverts commit f1f8e7cd6f796b15ed011361f09b57db796d9b4e.

Revert "staging/android: fix build issues"

This reverts commit 3cc8af27c10b5e1eb8e9ad2b19823f3553647405.

Revert "Revert "Staging: android: mark subsystem as broken""

This reverts commit 034309060232c703e843b6b63d35f3a56f9dd2c4.

Revert "ARM: Make low-level printk work"

This reverts commit 39078ee4d12d5b33108f9c56c24cc9c31d1d54bd.

Revert "[ARM] Add code to prevent system calls from being restarted muliple times before returning from the kernel."

This reverts commit 85d747b476df558eb36fd9966125a08f02ab5d12.

Revert "[ARM] armv6 dcc tty driver"

This reverts commit 8084e5f64a0fd0272dec87aef364c9e67d5190f7.

Revert "[ARM] Allow ICEDCC to work with CPU_V7 as well as CPU_V6."

This reverts commit bdc8620a08c9aba3848f1bf256be4c17153efb21.

Revert "[ARM] avoid mis-detecting some V7 cores in the decompressor"

This reverts commit 7725dd9abd08371ccab1025e5b7b77bd5a206e73.

Revert "mm: Add min_free_order_shift tunable."

This reverts commit c177d04116de6acff4d41706df54cf6c909aa5a2.

Revert "mm: Check if any page in a pageblock is reserved before marking it MIGRATE_RESERVE"

This reverts commit 675bed294c5136b04e283f647e5c73fb897cfd19.

Revert "futex: Restore one of the fast paths eliminated by 38d47c1b7075bd7ec3881141bb3629da58f88dab"

This reverts commit 8d4c42afa543eda97ce1bc88f160ac1e0379ec52.

Revert "[ARM] Optionally flush entire dcache from v6_dma_flush_range"

This reverts commit 3414e45fe081b2f7b89a2156e0b7eec26f77839b.

Revert "Add build option to to set the default panic timeout."

This reverts commit 207f66e23a69bc23265e1f133702bc59c3096696.

Revert "sched: Enable might_sleep before initializing drivers."

This reverts commit 563036940546f44a6232bee51459e7ea7d2da2c7.

Revert "sched: make task dump print all 15 chars of proc comm"

This reverts commit 604ad7390d7ba24330d7b36da522e3e65a21a4a9.

Revert "Make /dev/mem configurable, as we don't want it."

This reverts commit 196f3dc567992f06be0699437f4d4bd2a9a67f15.

Revert "w1: don't allow arbitrary users to remove w1 devices"

This reverts commit b08a883b6dce4b0f0cd52d8bee7505472301387c.

Revert "[docs] android: Add android config documentation to boot framework."

This reverts commit 9319b2654f1dc959d16a9169112c4e1d37d7bb5d.

Revert "PM: Add wake lock api."

This reverts commit 046ebf066da0165666f919be16320b2d3ce01d73.

Conflicts:

include/linux/wakelock.h

Revert "PM: Add early suspend api."

This reverts commit e86d97ab0243a7958ead9386e6509899018b2a8d.

Revert "PM: Implement wakelock api."

This reverts commit 1ea6dbb5067c5b0d0d75da730ae94af52150ce12.

Revert "power: Prevent spinlock recursion when wake_unlock() is called"

This reverts commit 368bb8b6eed4c72d19f75669335d87f884fe2a94.

Revert "power: wakelocks: fix buffer overflow in print_wake_locks"

This reverts commit 0f8a3256cb9b7535609e01066f3fe912998fba7e.

Revert "PM: wakelocks: Use seq_file for /proc/wakelocks so we can get more than 3K of stats."

This reverts commit d38f947b14caa880e5449ed33ffb9d20002a3de6.

Revert "PM: Implement early suspend api"

This reverts commit 74643fdcc38e8806e630cc83ce0f114808ee50ff.

temp revert earlysuspend change

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

This reverts commit 5f36bdf15970bf5ef97dce533ddac32d85191d6b.

Revert "PM: Add user-space wake lock api."

This reverts commit f5c158e3963c9d06bff767954ec7ce426e2ae675.

Revert "PM: wakelock: Abort task freezing if a wake lock is held."

This reverts commit 9a4999395d8b46f7005f9d1d61e0ef922b7cf49f.

Revert "PM: wakelock: Don't dump unfrozen task list when aborting try_to_freeze_tasks after less than one second"

This reverts commit ddbad8da3109a04b623976e9585f10a184694843.

Conflicts:

kernel/power/process.c

Revert "PM: earlysuspend: Add console switch when user requested sleep state changes."

This reverts commit 849d91c2b34843ed8c96dd6123c050f6ab8ba34a.

Revert "consoleearlysuspend: Fix for 2.6.32"

This reverts commit 7fc8c1c2813bd2c08e9a2fe1958451a33f30df14.

Revert "PM: earlysuspend: Removing dependence on console."

This reverts commit cc2ae286f899544417e94e1f10004ffa3ab327fa.

Revert "rtc: Add android alarm driver."

This reverts commit b76a757d7b11b2eee422a917067193b31a1a994c.

Revert "rtc: alarm: Add in-kernel alarm interface"

This reverts commit d1d79061a9d4a184dc026ca6dc105d17da0693c3.

Revert "rtc: Try to prevent RTC errors from accumulating."

This reverts commit 65a84712596bfd5b0831b8a09691ad3eca391ade.

Revert "ledtrig-sleep: Add led trigger for sleep debugging."

This reverts commit 2ec68be75c83c832913acb8756daec7d37aae067.

Revert "Input: Hold wake lock while event queue is not empty."

This reverts commit a92683626c2061c51701917c5dcbd0e1c91a04e2.

Revert "Input: Use monotonic time for event time stamps."

This reverts commit 9abcb847eab34907c1bb0eac4a3b402977ea0e37.

Revert "input: evdev: Use unique wakelock names"

This reverts commit f8d61c26afb6b6a47f1a774e3f25ca7ea49b0053.

Revert "power_supply: Hold a wake_lock while power supply change notifications are pending"

This reverts commit cd1ffe8d5d97279f21dfc7098985a550fc0f428b.

Revert "switch: switch class and GPIO drivers."

This reverts commit 310504662c220173d097a420a75756940c9f7e7f.

Revert "pmem: Add pmem driver"

This reverts commit 653d96473f49110e6626eed73e8f3c85fbf3d8b8.

Revert "Add android_aid.h"

This reverts commit d69e8af59880b55f8c7db87ce31e7147d2be8cad.

Revert "ashmem for 2.6.27."

This reverts commit 97f93ad8e2e34080a528666314d85ce7e89b3354.

Revert "Paranoid network."

This reverts commit 910b063a7e65960c1bb9cc4e91e9273b020709da.

Revert "net: socket ioctl to reset connections matching local address"

This reverts commit e97bf10949b28a6815f149fb06167409bd86a297.

Revert "sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size"

This reverts commit 9e0cd4352c967f2a1d50646d7a0e1caa5591d036.

Revert "uidstat: Adding uid stat driver to collect network statistics."

This reverts commit ab6c8fc0decb0b39f8cff97d4889fef5c3a50aa7.

Conflicts:

drivers/misc/Kconfig

Revert "FAT: Add new ioctl VFAT_IOCTL_GET_VOLUME_ID for reading the volume ID."

This reverts commit e563c281d14e3af5f6a85c7371a984dbb6c3c700.

Revert "Grants system server access to /proc/<pid>/oom_adj for Android applications."

This reverts commit 004f0ae31748b0f2d77c3bf3bff927b6ce2780bc.

Revert "Input: Generic GPIO Input device."

This reverts commit cbc1c940b59973fafcd1e78648144d4e0024174e.

Revert "Input: gpio_input: Fix keys with keycode 0x100-0x1ff"

This reverts commit 0103b65fe81367bfa61551ec328a30debc153030.

Revert "Input: gpio_event: Allow multiple input devices per gpio_event device"

This reverts commit f263c5383a87531ba05e342c06ef238250061939.

Revert "Input: gpio_input: disable_irq -> disable_irq_nosync"

This reverts commit 22c233c3439e9b6bf86b0bb9d952d9d9b676d590.

Revert "input: Add keyreset driver."

This reverts commit d94329d008a12abab1943304efd6f10f4fdc1f0f.

Conflicts:

drivers/input/Makefile

Revert "input: keychord: Add keychord driver"

This reverts commit 6cd91b7b3e7687595544380f8372318b5c17c07d.

Revert "Input: synaptics_i2c_rmi: Driver for Synaptics Touchscreens using RMI over I2C."

This reverts commit cf8b77e6a6c7cb87f6e5a5216e8f27a89bc047f6.

Revert "Input: synaptics_i2c_rmi: Add support for panels with has-no-relative-data property."

This reverts commit 15fcd92b7a155185e1c4401cd5a0ef28efe65e54.

Revert "Input: synaptics_i2c_rmi: Add sensitivity adjust option."

This reverts commit 3929c1894c66d55c076be4e88780ff3205958411.

Revert "Input: synaptics_i2c_rmi: Send new multi touch events"

This reverts commit 00757787ddca64ccaf624394d169a79e647c0865.

Revert "Input: synaptics_i2c_rmi: Add irqflags to platform data struct to pass them to driver"

This reverts commit 252e0e32acd8fc3ff204844c51fdacf3e57ad001.

Revert "mmc: Add status IRQ and status callback function to mmc platform data"

This reverts commit cfd429c65523ddf1be48ff1835a2776d93688fb2.

Revert "mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection"

This reverts commit ed6df5648f7c6270ecc24f4f36ac8ead30bc1f5f.

Revert "mmc: Add concept of an 'embedded' SDIO device."

This reverts commit 6558addc2ad78c412d6791544305256d5f90784c.

Revert "trout: Add functions for WiFi"

This reverts commit 8c542b3a4e7855926d7b9f533492eede643ff0ff.

Revert "mmc: Add new API call 'sdio_reset_comm' for resetting communication with an SDIO device"

This reverts commit b6c5dbe49bdfd8f814243e7b7922167e9fbc853b.

Revert "mmc: sd: When resuming, try a little harder to init the card"

This reverts commit c7e87866b25cb49a830c85b0206436a7b0e3e40b.

Revert "mmc: sd: Add retries in re-detection"

This reverts commit 5b23a96fd66d13f00315d5d46f2b399464707a90.

Revert "mmc: core: Hold a wake lock accross delayed work + mmc rescan"

This reverts commit 126f493e6b281b802471ce475c83c5a6ae58e26d.

Revert "mmc: core: Add deferred bus resume policy."

This reverts commit 40594a00454a1771286d86a8b3230ae5dba1a875.

Conflicts:

include/linux/mmc/host.h

Revert "mmc: mmcblk: Add support for deferred SD bus resume"

This reverts commit a31e8fffe82b08ace454b6190d60d31779ccf3d7.

Revert "mmc: sdio: Claim host in sdio_reset_comm()"

This reverts commit a7f4cf5b4cc1c0b5ba033a9324fbe9f74b90e04f.

Revert "mmc: block: Resume multi-block reads after transient read errors."

This reverts commit 94f9243a145376ef793dce987f4eeb42adf6f289.

Revert "mmc: sdio: Add high speed support to sdio_reset_comm()"

This reverts commit 25c29cc964ec4d29370e8af7ae3b51f1f6a239ac.

Revert "mmc_block: add dev_t initialization check"

This reverts commit 10cd61b99858ac55ff0a2674a416df01eb048165.

Revert "mmc_block: fix probe error cleanup bug"

This reverts commit 28967844a184d9fe5ca613684c7f5065b616194f.

Revert "mmc_block: fix queue cleanup"

This reverts commit a895a6359c2dfa5a7571fd8c23811364aab503b6.

Revert "mmc: allow for MMC v4.4"

This reverts commit f037ade21c3bd5a98460d9901ad987f497bc4ec3.

Revert "drivers: mmc: Fix minimal frequency assignment"

This reverts commit 79fe6726738e68f19d982213cdf8b7ff438d5157.

Revert "android_usb: Composite USB gadget driver for android."

This reverts commit 2c7c4829ac40fd18852a0c8bf0521a30a2ef2098.

Revert "drivers: usb: gadget: handle NULL descriptors in composite config_buf"

This reverts commit f355c97f4caa2f12b6561ccf2497c4860e47a572.

Revert "drivers: usb: gadget: Add helper function for installing ACM gadget function."

This reverts commit 5502501ffd887bfe047c1f3e1e36ac06b0f0e756.

Revert "USB: composite: Fix USB WHQL Certification Issues"

This reverts commit 7558ae6cd0d401b863f8f8d63fee12348270d045.

Revert "USB: composite: Add flag to usb_function to hide its interface during enumeration"

This reverts commit ee26eaf1392e4f38ed8d23047a6aa230d5a68188.

Revert "USB: composite: Allow configurations to handle unhandled setup requests"

This reverts commit 11d0a9ece74897740ffb987675c46adf1f782724.

Revert "USB: gadget: android: android USB gadget improvements:"

This reverts commit dd5acba95def6cd1fed0fcd9b047312f8ca8bef2.

Conflicts:

drivers/usb/gadget/f_adb.c

Revert "USB: gadget: adb: Queue read requests with length specified by client."

This reverts commit 9bebaa516d632a1ac16aad0955dc8dd7897fdad9.

Revert "USB: gadget: android: android USB gadget improvements:"

This reverts commit 0ab69f47e172739fd499f09469fde6eb16e9287d.

Revert "tiwlan: Add abstract wifi control functions support"

This reverts commit 17a60bbffc14d01992f21313dae5b7ddde554152.

Revert "block: block_dump: Add number of sectors to debug output"

This reverts commit c6bebce007c71ffda935e1b4309b4eeb149f31bb.

Revert "fs: block_dump: Don't display inode changes if block_dump < 2"

This reverts commit 56788ee7bef1c0e32e1db3b0f315155c721dd818.

Revert "yaffs: Import yaffs from Tue Mar 17 01:12:00 2009 +0000"

This reverts commit 4ee018b76663290410f82e50c5236fc9bf174d3f.

Revert "yaffs: Set YAFFS_IGNORE_TAGS_ECC if compiled without ECC support."

This reverts commit 1d5980b7f201b4eb9f013cdcd678f811f133526f.