shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
174,356 Commits 55 Branches 2,486 Tags
03490ddbd2d46d73ca99039d0c04939748a66b66
Commit Graph

174356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
黄涛
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
黄涛
9a2480e274 Revert "Staging: android: binder: Create dedicated workqueue for binder deferred work" 
This reverts commit 64fa454e9d.
 2011-07-30 22:16:41 +08:00
黄涛
f06b6247a2 Revert "lowmemorykiller: Don't try to kill the same pid over and over" 
This reverts commit 65c9eb5fc0.
 2011-07-30 22:16:40 +08:00
黄涛
5d159c8120 Revert "USB: android gadget: mass storage: Fix format issue for Vista Host" 
This reverts commit fd515513a3.
 2011-07-30 22:16:38 +08:00
黄涛
f911f45786 Revert "[ARM] Do not call flush_cache_user_range with mmap_sem held" 
This reverts commit 7bc14acfbb.
 2011-07-30 22:16:37 +08:00
黄涛
b0c1e90837 Revert "staging: android: lowmemkiller: Substantially reduce overhead during reclaim" 
This reverts commit 3508951576.
 2011-07-30 22:16:35 +08:00
黄涛
2870cfe3d5 Revert "binder: Fix memory corruption via page aliasing" 
This reverts commit 6bdee543a3.
 2011-07-30 22:16:34 +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
黄涛
d7473f13a3 Revert "staging: android: lowmemorykiller: Fix task_struct leak" 
This reverts commit 896c969afc.
 2011-07-30 22:16:31 +08:00
黄涛
bd9ac29b9c Revert "staging: android: lowmemorykiller: Remove bitrotted codepath" 
This reverts commit ab24f9c8fd.
 2011-07-30 22:16:29 +08:00
黄涛
7298097b0d Revert "Implement read(2) in ashmem driver" 
This reverts commit 16fe6f1aa7.
 2011-07-30 22:16:26 +08:00
黄涛
f65181d5ed temp revert timed_gpio change 2011-07-30 22:16:08 +08:00
黄涛
07ba42ba3d Revert "Merge remote branch 'common/android-2.6.32' into develop" 
This reverts commit 5091b83839, reversing
changes made to 0fd331518d.
 2011-07-30 16:26:01 +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