linux-uconsole/drivers/input/misc
黄涛 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
..
apanel.c Input: apanel - convert to new i2c binding 2009-01-07 14:29:17 +01:00
ati_remote.c USB: remove info() macro from usb input drivers 2008-10-17 14:41:10 -07:00
ati_remote2.c Input: ati_remote2 - use non-atomic bitops 2009-05-19 19:24:42 -07:00
atlas_btns.c Input: atlas_btns - add support for loadable keymaps 2008-01-21 01:11:06 -05:00
bfin_rotary.c Input: add Blackfin rotary input driver 2009-07-23 01:15:09 -07:00
capella_cm3602.c 默认情况下关闭psensor 2010-09-22 09:13:08 +08:00
cm109.c Input: cm109 - add keymap for ATCom AU-100 phone 2008-11-11 14:02:13 -05:00
cobalt_btns.c Merge commit 'v2.6.31-rc4' into next 2009-07-22 21:47:29 -07:00
dm355evm_keys.c Input: dm355evm_keys - remove dm355evm_keys_hardirq 2009-09-17 23:24:01 -07:00
gpio_axis.c Input: gpio_event: Allow multiple input devices per gpio_event device 2010-02-08 15:07:48 -08:00
gpio_event.c Input: gpio_event: Allow multiple input devices per gpio_event device 2010-02-08 15:07:48 -08:00
gpio_input.c Input: gpio_input: disable_irq -> disable_irq_nosync 2010-02-08 15:07:48 -08:00
gpio_matrix.c Input: gpio_input: disable_irq -> disable_irq_nosync 2010-02-08 15:07:48 -08:00
gpio_output.c Input: gpio_event: Allow multiple input devices per gpio_event device 2010-02-08 15:07:48 -08:00
hp_sdc_rtc.c Input: hp_sdc_rtc - fix test in hp_sdc_rtc_read_rt() 2009-10-18 00:21:34 -07:00
isl29028.c modify psensor for phonesdk 2011-04-22 20:11:30 -07:00
isl29028.h update l/p sensor isl29028 driver for phonesdk 2011-03-02 03:26:12 -08:00
ixp4xx-beeper.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
Kconfig xxm update FIH 1: update mpu3050 2: delete no use file 3:update rk29_FIH_defconfig 2011-03-24 19:43:17 +08:00
keychord.c input: keychord: Add keychord driver 2010-02-08 15:07:49 -08:00
keyspan_remote.c Input: replace remaining __FUNCTION__ occurrences 2008-05-16 14:45:58 -04:00
m68kspkr.c
Makefile xxm update FIH 1: update mpu3050 2: delete no use file 3:update rk29_FIH_defconfig 2011-03-24 19:43:17 +08:00
pcap_keys.c input: PCAP2 misc input driver 2009-09-17 09:47:12 +02:00
pcf50633-input.c input: PCF50633 input driver 2009-01-11 01:34:25 +01:00
pcspkr.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2009-07-22 09:25:31 -07:00
powermate.c Input: replace remaining __FUNCTION__ occurrences 2008-05-16 14:45:58 -04:00
rb532_button.c Input: add driver for S1 button of rb532 2009-03-09 20:10:12 -07:00
rotary_encoder.c Input: rotary_encoder - fix relative axis support 2009-10-05 22:00:01 -07:00
sgi_btns.c INPUT: sgi_btns: Add license specification 2008-10-27 16:18:28 +00:00
sparcspkr.c Input: sparkspkr - move remove() functions to .devexit.text 2009-10-05 21:59:53 -07:00
tps65910-pwrbutton.c cwz add tps65910 driver 2011-02-27 18:19:53 -08:00
twl4030-pwrbutton.c Input: add twl4030-pwrbutton driver 2009-04-19 23:08:41 -07:00
uinput.c headers: remove sched.h from poll.h 2009-10-04 15:05:10 -07:00
winbond-cir.c Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
wistron_btns.c Input: wistron_btns - add DMI entry for Medion WIM2030 laptop 2009-10-05 21:59:42 -07:00
wm831x-on.c 1.make sure power key can wake up system and light lcd even though pressure time is short. 2011-06-17 04:08:53 +08:00
yealink.c USB: remove info() macro from usb input drivers 2008-10-17 14:41:10 -07:00
yealink.h