openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/input/misc
History
Linus Torvalds 31b6ca0af7 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits)
  Input: wacom_w8001 - support pen or touch only devices
  Input: wacom_w8001 - use __set_bit to set keybits
  Input: bu21013_ts - fix misuse of logical operation in place of bitop
  Input: i8042 - add Acer Aspire 5100 to the Dritek list
  Input: wacom - add support for digitizer in Lenovo W700
  Input: psmouse - disable the synaptics extension on OLPC machines
  Input: psmouse - fix up Synaptics comment
  Input: synaptics - ignore bogus mt packet
  Input: synaptics - add multi-finger and semi-mt support
  Input: synaptics - report clickpad property
  input: mt: Document interface updates
  Input: fix double equality sign in uevent
  Input: introduce device properties
  hid: egalax: Add support for Wetab (726b)
  Input: include MT library as source for kerneldoc
  MAINTAINERS: Update input-mt entry
  hid: egalax: Add support for Samsung NB30 netbook
  hid: egalax: Document the new devices in Kconfig
  hid: egalax: Add support for Wetab
  hid: egalax: Convert to MT slots
  ...

Fixed up trivial conflict in drivers/input/keyboard/Kconfig
 		2011-01-07 14:45:47 -08:00
..
88pm860x_onkey.c Input: 88pm860x_onkey - remove invalid irq number assignment 2010-05-19 10:14:10 -07:00
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2011-01-07 14:45:47 -08:00
Makefile Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2011-01-07 14:45:47 -08:00
ab8500-ponkey.c Input: ab8500-ponkey - fix IRQ freeing in error path 2010-10-24 21:56:17 -07:00
ad714x-i2c.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
ad714x-spi.c Input: add Analog Devices AD714x captouch input driver 2010-04-13 23:27:16 -07:00
ad714x.c fix typos concerning "initiali[zs]e" 2010-06-16 18:05:05 +02:00
ad714x.h Input: add Analog Devices AD714x captouch input driver 2010-04-13 23:27:16 -07:00
adxl34x-i2c.c Input: adxl34 - make enable/disable separate from suspend/resume 2010-07-03 13:13:21 -07:00
adxl34x-spi.c Input: adxl34 - make enable/disable separate from suspend/resume 2010-07-03 13:13:21 -07:00
adxl34x.c Input: adxl34x - do not mark device as disabled on startup 2010-08-05 10:07:31 -07:00
adxl34x.h Input: adxl34 - make enable/disable separate from suspend/resume 2010-07-03 13:13:21 -07:00
apanel.c Input: make i2c device ids constant 2010-01-09 23:28:33 -08:00
ati_remote.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
ati_remote2.c Input: ati_remote2 - switch to using new keycode interface 2010-09-15 23:10:53 -07:00
atlas_btns.c Input: atlas_btns - switch to using pr_err() and friends 2010-07-13 09:43:24 -07:00
bfin_rotary.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
cm109.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
cma3000_d0x.c Input: add CMA3000 accelerometer driver 2010-11-30 23:05:21 -08:00
cma3000_d0x.h Input: add CMA3000 accelerometer driver 2010-11-30 23:05:21 -08:00
cma3000_d0x_i2c.c Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLE 2010-12-07 22:13:40 -08:00
cobalt_btns.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dm355evm_keys.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hp_sdc_rtc.c Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:49:54 -07:00
ixp4xx-beeper.c ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt 2010-07-29 13:24:57 +02:00
keyspan_remote.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
m68kspkr.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
max8925_onkey.c input: Monitor both onkey up and down event 2010-10-29 00:29:46 +02:00
pcap_keys.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pcf8574_keypad.c Input: pcf_keypad - convert to dev_op_ops 2010-11-11 22:02:57 -08:00
pcf50633-input.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pcspkr.c i8253: Convert i8253_lock to raw_spinlock 2010-03-02 10:28:38 +01:00
powermate.c Input: return -ENOMEM in select drivers when memory allocation fails 2010-10-13 07:49:23 -07:00
pwm-beeper.c Input: Add pwm beeper driver 2010-07-14 01:23:11 -07:00
rb532_button.c Input: add driver for S1 button of rb532 2009-03-09 20:10:12 -07:00
rotary_encoder.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sgi_btns.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sparcspkr.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
twl4030-pwrbutton.c Input: twl4030-pwrbutton - replace __devinit with __init 2010-07-08 21:02:55 -07:00
twl4030-vibra.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
uinput.c Input: introduce device properties 2010-12-20 09:37:33 +01:00
wistron_btns.c Input: wistron_btns - fix a memory leak in wb_module_init error path 2010-06-28 01:12:22 -07:00
wm831x-on.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
yealink.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
yealink.h tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00