黄涛 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
..
alps.c	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
alps.h	Input: ALPS - add interleaved protocol support (Dell E6x00 series)	2010-01-28 15:00:43 -08:00
amimouse.c	get rid of input BIT* duplicate defines	2007-10-19 11:53:42 -07:00
appletouch.c	Input: appletouch - improve finger detection	2009-06-03 07:37:54 -07:00
atarimouse.c	Input: atamouse - various cleanups	2008-06-30 09:36:46 -04:00
bcm5974.c	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
elantech.c	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
elantech.h	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
gpio_mouse.c	Input: gpio_mouse - use standard driver registration method	2009-07-07 22:47:14 -07:00
hgpk.c	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
hgpk.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
inport.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
Kconfig	Input: add new driver for Sentelic Finger Sensing Pad	2009-08-19 21:46:09 -07:00
lifebook.c	Input: lifebook - fix settings for CF-72	2009-11-16 22:27:12 -08:00
lifebook.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
logibm.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
logips2pp.c	Input: logips2pp - model 73 is actually TrackMan FX	2009-10-18 00:03:54 -07:00
logips2pp.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
Makefile	Input: add new driver for Sentelic Finger Sensing Pad	2009-08-19 21:46:09 -07:00
maplemouse.c	maple: input: fix up maple mouse driver	2009-04-27 09:22:31 +09:00
pc110pad.c	Input: pc110pad - remove unused variable dev	2009-04-15 09:04:03 -07:00
psmouse-base.c	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
psmouse.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
pxa930_trkball.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-03-02 15:43:03 -08:00
rpcmouse.c	[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h	2009-03-25 10:21:35 +00:00
sentelic.c	Input: libps2 - additional locking for i8042 ports	2009-09-17 23:23:45 -07:00
sentelic.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
sermouse.c	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
synaptics_i2c.c	Input: synaptics_i2c - switch to using __cancel_delayed_work()	2009-09-17 23:24:01 -07:00
synaptics.c	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
synaptics.h	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
touchkit_ps2.c	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
touchkit_ps2.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
trackpoint.c	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
trackpoint.h	Input: psmouse - use boolean type	2009-09-10 22:11:38 -07:00
vsxxxaa.c	Input: serio - don't use serio->write() directly	2009-08-05 00:43:43 -07:00