黄涛
|
7e0d721539
|
Revert "PM: Add wake lock api."
This reverts commit 046ebf066d.
Conflicts:
include/linux/wakelock.h
|
2011-07-30 23:08:42 +08:00 |
|
黄涛
|
745a1e8c92
|
Revert "PM: Add early suspend api."
This reverts commit e86d97ab02.
|
2011-07-30 23:05:48 +08:00 |
|
黄涛
|
cd951537a7
|
Revert "rtc: Add android alarm driver."
This reverts commit b76a757d7b.
|
2011-07-30 22:58:00 +08:00 |
|
黄涛
|
8487afeae9
|
Revert "rtc: alarm: Add in-kernel alarm interface"
This reverts commit d1d79061a9.
|
2011-07-30 22:57:59 +08:00 |
|
黄涛
|
3b9b90f68f
|
Revert "power_supply: Hold a wake_lock while power supply change notifications are pending"
This reverts commit cd1ffe8d5d.
|
2011-07-30 22:57:48 +08:00 |
|
黄涛
|
096bd918e7
|
Revert "switch: switch class and GPIO drivers."
This reverts commit 310504662c.
|
2011-07-30 22:57:46 +08:00 |
|
黄涛
|
554ebd8931
|
Revert "pmem: Add pmem driver"
This reverts commit 653d96473f.
|
2011-07-30 22:57:44 +08:00 |
|
黄涛
|
052277cd94
|
Revert "Add android_aid.h"
This reverts commit d69e8af598.
|
2011-07-30 22:57:42 +08:00 |
|
黄涛
|
f72a734331
|
Revert "ashmem for 2.6.27."
This reverts commit 97f93ad8e2.
|
2011-07-30 22:57:41 +08:00 |
|
黄涛
|
701364a426
|
Revert "net: socket ioctl to reset connections matching local address"
This reverts commit e97bf10949.
|
2011-07-30 22:57:37 +08:00 |
|
黄涛
|
ea32bd9ebc
|
Revert "uidstat: Adding uid stat driver to collect network statistics."
This reverts commit ab6c8fc0de.
Conflicts:
drivers/misc/Kconfig
|
2011-07-30 22:57:02 +08:00 |
|
黄涛
|
d67d6c9d7c
|
Revert "FAT: Add new ioctl VFAT_IOCTL_GET_VOLUME_ID for reading the volume ID."
This reverts commit e563c281d1.
|
2011-07-30 22:56:15 +08:00 |
|
黄涛
|
57fa7b7e18
|
Revert "Input: Generic GPIO Input device."
This reverts commit cbc1c940b5.
|
2011-07-30 22:56:11 +08:00 |
|
黄涛
|
12e649a57b
|
Revert "Input: gpio_event: Allow multiple input devices per gpio_event device"
This reverts commit f263c5383a.
|
2011-07-30 22:56:08 +08:00 |
|
黄涛
|
1f1e84a12d
|
Revert "input: Add keyreset driver."
This reverts commit d94329d008.
Conflicts:
drivers/input/Makefile
|
2011-07-30 22:55:10 +08:00 |
|
黄涛
|
9a4b4eecd5
|
Revert "input: keychord: Add keychord driver"
This reverts commit 6cd91b7b3e.
|
2011-07-30 22:53:41 +08:00 |
|
黄涛
|
09f9b10843
|
Revert "Input: synaptics_i2c_rmi: Driver for Synaptics Touchscreens using RMI over I2C."
This reverts commit cf8b77e6a6.
|
2011-07-30 22:53:39 +08:00 |
|
黄涛
|
b097e55847
|
Revert "Input: synaptics_i2c_rmi: Add sensitivity adjust option."
This reverts commit 3929c1894c.
|
2011-07-30 22:53:36 +08:00 |
|
黄涛
|
2f86d55056
|
Revert "Input: synaptics_i2c_rmi: Add irqflags to platform data struct to pass them to driver"
This reverts commit 252e0e32ac.
|
2011-07-30 22:53:33 +08:00 |
|
黄涛
|
8700a6545b
|
Revert "mmc: Add status IRQ and status callback function to mmc platform data"
This reverts commit cfd429c655.
|
2011-07-30 22:53:31 +08:00 |
|
黄涛
|
6b99136498
|
Revert "mmc: Add concept of an 'embedded' SDIO device."
This reverts commit 6558addc2a.
|
2011-07-30 22:53:07 +08:00 |
|
黄涛
|
e09b1d3ea8
|
Revert "trout: Add functions for WiFi"
This reverts commit 8c542b3a4e.
|
2011-07-30 22:53:05 +08:00 |
|
黄涛
|
ad7271f11e
|
Revert "mmc: core: Add deferred bus resume policy."
This reverts commit 40594a0045.
Conflicts:
include/linux/mmc/host.h
|
2011-07-30 22:51:57 +08:00 |
|
黄涛
|
bef8796251
|
Revert "android_usb: Composite USB gadget driver for android."
This reverts commit 2c7c4829ac.
|
2011-07-30 22:48:57 +08:00 |
|
黄涛
|
7ff3fd1403
|
Revert "USB: composite: Add flag to usb_function to hide its interface during enumeration"
This reverts commit ee26eaf139.
|
2011-07-30 22:48:44 +08:00 |
|
黄涛
|
4c0244f8ef
|
Revert "USB: gadget: android: android USB gadget improvements:"
This reverts commit dd5acba95d.
Conflicts:
drivers/usb/gadget/f_adb.c
|
2011-07-30 22:46:25 +08:00 |
|
黄涛
|
0e4a76aad7
|
Revert "tiwlan: Add abstract wifi control functions support"
This reverts commit 17a60bbffc.
|
2011-07-30 22:45:26 +08:00 |
|
黄涛
|
193325765c
|
Revert "net: add PPP on L2TP Access Concentrator (PPPoLAC) driver."
This reverts commit dbdb1c3278.
|
2011-07-30 22:45:00 +08:00 |
|
黄涛
|
648a0a228c
|
Revert "net: add PPP on PPTP Network Server (PPPoPNS) driver."
This reverts commit 7cc7c63e62.
|
2011-07-30 22:44:57 +08:00 |
|
黄涛
|
f3d870811c
|
Revert "net: PPPoPNS and PPPoLAC fixes."
This reverts commit 286fcd1c1e.
|
2011-07-30 22:44:45 +08:00 |
|
黄涛
|
5f0dc84d54
|
Revert "security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable()."
This reverts commit c30cd45aad.
|
2011-07-30 22:44:43 +08:00 |
|
黄涛
|
b1da95bb09
|
Revert "kernel_debugger_core: add interrupt-context debugger core"
This reverts commit 25049b34a8.
|
2011-07-30 22:44:36 +08:00 |
|
黄涛
|
25b9908282
|
Revert "wl127x-rfkill: Add power control driver for TI WL127X Bluetooth chips"
This reverts commit 6adc27186c.
Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
|
2011-07-30 22:43:35 +08:00 |
|
黄涛
|
e13f235ea5
|
Revert "serial_core: Add wake_peer uart operation which is called before starting UART TX. The idea here is to provide a mechanism where we can wakeup our peer before sending data."
This reverts commit f5353976c6.
|
2011-07-30 22:41:09 +08:00 |
|
黄涛
|
8634a0f46e
|
Revert "USB: composite: Add class driver for enabling and disabling USB functions."
This reverts commit f8cf7f90ac.
|
2011-07-30 22:26:57 +08:00 |
|
黄涛
|
4c9ec236d2
|
Revert "pmem: Add cache flush ioctl for pmem buffers"
This reverts commit f6320db511.
|
2011-07-30 22:26:26 +08:00 |
|
黄涛
|
d93f4ea7e3
|
Revert "USB: gadget: f_rndis: Add platform data for RNDIS vendor ID and MAC address."
This reverts commit 7dc693330c.
|
2011-07-30 22:26:21 +08:00 |
|
黄涛
|
380873f76d
|
Revert "Merge commit 'v2.6.32.9' into android-2.6.32"
This reverts commit 67078ecae3, reversing
changes made to dc136618cb.
Conflicts:
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/eeprom.c
drivers/net/wireless/ath/ath5k/eeprom.h
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/ath/ath9k/ath9k.h
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/reg.h
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/b43/b43.h
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/rfkill.c
drivers/net/wireless/b43legacy/rfkill.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/iwlwifi/iwl-3945.c
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-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-core.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/iwl3945-base.c
drivers/net/wireless/iwmc3200wifi/iwm.h
drivers/net/wireless/libertas/scan.c
drivers/net/wireless/libertas/wext.c
drivers/net/wireless/orinoco/wext.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rtl818x/rtl8187.h
drivers/net/wireless/rtl818x/rtl8187_dev.c
drivers/net/wireless/rtl818x/rtl8187_rfkill.c
drivers/usb/serial/option.c
|
2011-07-30 22:24:29 +08:00 |
|
黄涛
|
efaabc0db0
|
Revert "wlan: Extract generic wlan platform data from tiwlan specific header"
This reverts commit 275f83d836.
|
2011-07-30 22:16:55 +08:00 |
|
黄涛
|
496721f1c2
|
Revert "sched: Add a generic notifier when a task struct is about to be freed"
This reverts commit 9e6cb2f4db.
|
2011-07-30 22:16:32 +08:00 |
|
黄涛
|
c69559f6a6
|
Revert "Merge remote branch 'common/android-2.6.32' into develop"
This reverts commit c7e039e278, reversing
changes made to d00e5f74ae.
|
2011-07-30 16:25:42 +08:00 |
|
黄涛
|
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 |
|
黄涛
|
7de15596db
|
Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"
This reverts commit 84aa38e58d, reversing
changes made to 9505d021e0.
|
2011-07-30 16:11:20 +08:00 |
|
黄涛
|
5f1e6e97d5
|
Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"
This reverts commit 7cd3739f32, reversing
changes made to 2748ae2cc2.
Conflicts:
drivers/usb/core/hub.c
drivers/usb/serial/option.c
|
2011-07-30 16:09:59 +08:00 |
|
黄涛
|
6a3f004727
|
Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"
This reverts commit 2caa51d22a, reversing
changes made to cc88c1f62a.
|
2011-07-30 16:01:15 +08:00 |
|
黄涛
|
2448a5573a
|
Revert "clocksource: Provide a generic mult/shift factor calculation"
This reverts commit cfc80b6829.
|
2011-07-30 15:56:49 +08:00 |
|
黄涛
|
45c82a64f8
|
Revert "lib: add support for LZO-compressed kernels"
This reverts commit 3a3ba0241a.
|
2011-07-30 15:55:13 +08:00 |
|
黄涛
|
3f2bbceb46
|
Revert "timer: Added usleep_range timer"
This reverts commit 18464b0b75.
|
2011-07-30 15:54:41 +08:00 |
|
黄涛
|
57a57994d5
|
Revert "clockevents: Use u32 for mult and shift factors"
This reverts commit b7ad2a012a.
|
2011-07-30 15:53:44 +08:00 |
|
黄涛
|
b877bcb0ec
|
rk29: include/linux/regulator/consumer.h: fix warning: no return statement in function returning non-void
|
2011-07-25 17:03:22 +08:00 |
|