Commit Graph

174370 Commits

Author SHA1 Message Date
黄涛
6df06bbf23 Revert "proc: smaps: Allow smaps access for CAP_SYS_RESOURCE"
This reverts commit 5c438f06fd.
2011-07-30 22:30:36 +08:00
黄涛
7e72dd7104 Revert "drivers: apanic: Android kernel panic handler."
This reverts commit 4360c49102.

Conflicts:

	drivers/misc/Kconfig
	drivers/misc/Makefile
2011-07-30 22:29:16 +08:00
黄涛
348c004dd8 Revert "ramconsole/apanic: Ensure ramconsole does not get cluttered by apanic threads"
This reverts commit 05ec8148bd.
2011-07-30 22:27:15 +08:00
黄涛
cdf8022685 Revert "misc: apanic: bad block handling"
This reverts commit 03d778875b.
2011-07-30 22:27:13 +08:00
黄涛
1b23fdb31d Revert "misc: apanic: erase kpanic when no data"
This reverts commit b4c785a83a.
2011-07-30 22:27:11 +08:00
黄涛
ec3e583df8 Revert "Staging: android: ram_console: Start ram console earlier"
This reverts commit 1d2b49700c.
2011-07-30 22:27:10 +08:00
黄涛
3859c37c29 Revert "Staging: android: timed_gpio: Request gpios."
This reverts commit 6bb28b20af.
2011-07-30 22:27:08 +08:00
黄涛
a21445e557 Revert "cpufreq: ondemand: Don't synchronize sample rate unless mulitple cpus present"
This reverts commit beb070f3d4.
2011-07-30 22:27:06 +08:00
黄涛
c0a6e19264 Revert "block: genhd: Add disk/partition specific uevent callbacks for partition info"
This reverts commit f9d6d7703f.
2011-07-30 22:27:05 +08:00
黄涛
23a401673b Revert "HACK stay compatible with the emulated TLS register HACK"
This reverts commit 197d3f06e7.
2011-07-30 22:27:03 +08:00
黄涛
fe09b9072b Revert "pca963x: Phillips PCA963X 4-bit i2c led driver"
This reverts commit 24152b5a73.
2011-07-30 22:27:01 +08:00
黄涛
e2a7bbb191 Revert "mmc: core: Release delayed mmc work wakelock after deep disable"
This reverts commit e4adc65374.
2011-07-30 22:27:00 +08:00
黄涛
dcc7c493d9 Revert "disable staging/dream"
This reverts commit 1d69bc989d.
2011-07-30 22:26:58 +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
黄涛
03490ddbd2 Revert "USB: android: Use composite class driver for enabling and disabling functions"
This reverts commit 65eb4c8d6e.
2011-07-30 22:26:55 +08:00
黄涛
e51c476a24 Revert "USB: gadget: Disable RNDIS function by default if CONFIG_USB_ANDROID_RNDIS is set"
This reverts commit cb75368573.
2011-07-30 22:26:54 +08:00
黄涛
f34f560696 Revert "USB: gadget: android: Specify USB_CLASS_COMM in device descriptor if using RNDIS"
This reverts commit 60701f4d86.
2011-07-30 22:26:52 +08:00
黄涛
58b26f7030 Revert "USB: composite: Compute interface numbers correctly when functions are hidden."
This reverts commit a3fccf6a0e.
2011-07-30 22:26:50 +08:00
黄涛
09c8f1ae12 Revert "USB: gadget: android: Fix special case for RNDIS ethernet function"
This reverts commit 316525238a.
2011-07-30 22:26:49 +08:00
黄涛
91a634a544 Revert "mtd: nand: Allow NAND chip ids to be included standalone."
This reverts commit 0a39ec04c5.
2011-07-30 22:26:47 +08:00
黄涛
c6b2229294 Revert "Add USB_ANDROID_RNDIS_WCEIS option."
This reverts commit aace891ed5.
2011-07-30 22:26:46 +08:00
黄涛
d8958cec3f Revert "Revert "Bluetooth: Fix rejected connection not disconnecting ACL link""
This reverts commit ce1c698ea8.
2011-07-30 22:26:44 +08:00
黄涛
3c0b997804 Revert "usb: gadget: u_ether: Remove warning from gether_disconnect()"
This reverts commit 980bfabc06.
2011-07-30 22:26:43 +08:00
黄涛
4b712030c9 Revert "power: wakelock: Print active wakelocks when has_wake_lock() is called"
This reverts commit 7175b7585f.
2011-07-30 22:26:41 +08:00
黄涛
993b15ca04 Revert "vmalloc: remove BUG_ON due to racy counting of VM_LAZY_FREE"
This reverts commit 21ba0cac4b.
2011-07-30 22:26:39 +08:00
黄涛
5ad16bf39f Revert "android: logger: Add new system log for framework/system log messages"
This reverts commit ae991396e9.
2011-07-30 22:26:37 +08:00
黄涛
844f6efb45 Revert "USB: gadget: android: Disable UMS when RNDIS ethernet is active."
This reverts commit a8d5021410.
2011-07-30 22:26:36 +08:00
黄涛
2ca8449fb8 Revert "Revert "Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP""
This reverts commit 33a3a31ffa.
2011-07-30 22:26:34 +08:00
黄涛
2b0abd67bb Revert "Revert "Bluetooth: Change RFCOMM to use BT_CONNECT2 for BT_DEFER_SETUP""
This reverts commit e7e66e1a05.
2011-07-30 22:26:33 +08:00
黄涛
e56efa4115 Revert "Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections."
This reverts commit 3b077241e0.
2011-07-30 22:26:31 +08:00
黄涛
33229d4a64 Revert "USB: gadget: composite: Don't call set_alt() on functions that are hidden."
This reverts commit 6fd76fd99e.
2011-07-30 22:26:30 +08:00
黄涛
a59b808905 Revert "USB: gadget: composite: Don't increment interface number for alt settings."
This reverts commit b1d4000fe6.
2011-07-30 22:26:28 +08:00
黄涛
4c9ec236d2 Revert "pmem: Add cache flush ioctl for pmem buffers"
This reverts commit f6320db511.
2011-07-30 22:26:26 +08:00
黄涛
c387a6e64f Revert "Revert "Bluetooth: Introduce L2CAP_LM_FLUSHABLE to allow flushing of ACL packets.""
This reverts commit 71682ea19f.
2011-07-30 22:26:25 +08:00
黄涛
1cd04b76d6 Revert "Bluetooth: Use non-flushable pb flag by default for ACL data on capable chipsets."
This reverts commit a47633bdbc.
2011-07-30 22:26:23 +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
黄涛
d02048a707 Revert "Revert "sysfs: Fix sysfs owner and group.""
This reverts commit dc136618cb.
2011-07-30 22:26:18 +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
黄涛
ee62eb5277 Revert "USB: gadget: f_mass_storage: Flush writes after every 4 MB."
This reverts commit 5cf1b82507.
2011-07-30 22:17:00 +08:00
黄涛
68e96addc4 Revert "apanic: make APANIC_LABEL depend on APANIC"
This reverts commit 00dc766f66.
2011-07-30 22:16:58 +08:00
黄涛
e7528a65cd Revert "USB: gadget: android: check for null _android_dev in android_register_function()"
This reverts commit 4bcc593ad9.
2011-07-30 22:16:56 +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
黄涛
4547af1975 Revert "proc: pagemap: Hold mmap_sem during page walk"
This reverts commit 0bf5516840.
2011-07-30 22:16:53 +08:00
黄涛
8449f32549 Revert "USB: gadget: android: mass_storage: Use spin_lock_irqsave/spin_unlock_irqrestore"
This reverts commit 3274abc33e.
2011-07-30 22:16:52 +08:00
黄涛
ec62f37b70 Revert "Bluetooth: Hack: Don't dereference null pointer."
This reverts commit 612cd5aa16.
2011-07-30 22:16:50 +08:00
黄涛
19a5d2b411 Revert "fs: partitions: Fix warnings in fs/partitions/check.c"
This reverts commit e27f17b531.
2011-07-30 22:16:49 +08:00
黄涛
d332594c63 Revert "USB: gadget: f_mass_storage: Defer handling interface changes until it is safe."
This reverts commit 0fc7f96b5b.
2011-07-30 22:16:47 +08:00
黄涛
278b2cbc24 Revert "Staging: android: timed_gpio: Properly discard invalid timeout values."
This reverts commit a7f5cb901d.
2011-07-30 22:16:46 +08:00
黄涛
b1d3b6d349 Revert "Revert "proc: pagemap: Hold mmap_sem during page walk""
This reverts commit 2c07d75cae.
2011-07-30 22:16:44 +08:00
黄涛
a620a88408 Revert "proc: pagemap: Hold mmap_sem during page walk"
This reverts commit 49ff3070f5.
2011-07-30 22:16:43 +08:00