openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/input/touchscreen
History
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
 		2011-01-13 10:05:56 -08:00
..
88pm860x-ts.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
Kconfig Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
Makefile Input: add ST1232 touchscreen controller driver 2010-12-15 23:40:13 -08:00
ad7877.c Input: ad7877 - switch to using threaded IRQ 2010-10-18 09:35:13 -07:00
ad7879-i2c.c Input: ad7879 - convert I2C to dev_pm_ops 2011-01-06 23:02:52 -08:00
ad7879-spi.c Input: ad7879 - fix spi word size to 16 bit 2010-07-03 13:13:20 -07:00
ad7879.c Input: ad7879 - prevent invalid finger data reports 2010-10-28 22:32:50 -07:00
ad7879.h Input: ad7879 - add open and close methods 2010-07-03 13:13:14 -07:00
ads7846.c Input: ads7846 - switch to using threaded IRQ 2010-10-17 21:10:28 -07:00
atmel-wm97xx.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
atmel_tsadcc.c Input: atmel_tsadcc - use platform parameters 2009-11-20 00:55:21 -08:00
bu21013_ts.c Input: bu21013_ts - fix misuse of logical operation in place of bitop 2010-12-27 17:23:10 -08:00
cy8ctmg110_ts.c Input: cy8ctmg110_ts - Convert to dev_pm_ops 2011-01-06 23:03:11 -08:00
da9034-ts.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
dynapro.c Input: add driver for Dynapro serial touchscreen 2009-10-26 11:01:30 -07:00
eeti_ts.c Input: eeti_ts - convert to dev_pm_ops 2011-01-06 23:02:57 -08:00
elo.c Input: elo - switch to using dev_xxx() when printing messages 2010-01-06 23:54:40 -08:00
fujitsu_ts.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
gunze.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
h3600_ts_input.c Input: serio - don't use serio->write() directly 2009-08-05 00:43:43 -07:00
hampshire.c Input: add driver for hampshire serial touchscreens 2010-04-13 23:27:41 -07:00
hp680_ts_input.c input: hp680_ts_input: ctrl_in/outX to __raw_read/writeX conversion. 2010-10-27 15:25:42 +09:00
htcpen.c Input: add HTC Shift Touchscreen Driver 2008-06-02 00:38:35 -04:00
inexio.c Input: Add driver for iNexio serial touchscreen. 2008-06-30 09:37:32 -04:00
intel-mid-touch.c Input: mrst-touchscreen - move out of staging 2010-09-01 19:43:36 -07:00
jornada720_ts.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
lpc32xx_ts.c Input: add LPC32xx touchscreen controller driver 2010-08-28 22:46:18 -07:00
mainstone-wm97xx.c Input: wm97xx - provide coordinate logs for accelerated I/O 2010-01-28 22:38:30 -08:00
mc13783_ts.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
mcs5000_ts.c Input: mcs5000_ts - convert to dev_pm_ops 2011-01-06 23:03:03 -08:00
migor_ts.c Input: migor_ts - convert to dev_pm_ops 2011-01-06 23:03:07 -08:00
mk712.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
mtouch.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
pcap_ts.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
penmount.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
qt602240_ts.c Input: qt602240_ts - fix wrong sizeof in object table allocation 2010-11-18 00:17:12 -08:00
s3c2410_ts.c Input: s3c2410_ts - fix s3c2410ts_probe error path 2010-09-02 20:11:52 -07:00
st1232.c Input: add ST1232 touchscreen controller driver 2010-12-15 23:40:13 -08:00
stmpe-ts.c Input: stmpe-ts - return -ENOMEM when memory allocation fails 2010-09-05 12:09:12 -07:00
tnetv107x-ts.c input: add driver for tnetv107x touchscreen controller 2010-09-24 07:40:32 -07:00
touchit213.c Input: add driver for Tabletkiosk Sahara TouchIT-213 touchscreen 2008-07-07 12:00:30 -04:00
touchright.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
touchwin.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
tps6507x-ts.c Input: tps6507x-ts - properly unregister input device on removal 2010-09-02 20:12:42 -07:00
tsc2007.c Input: tsc2007 - fix a redundant assignment for pdata 2010-09-02 20:14:00 -07:00
ucb1400_ts.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
usbtouchscreen.c Input: usbtouchscreen - add support for LG Flatron T1710B 2010-11-22 12:01:13 -08:00
w90p910_ts.c Input: w90p910_ts - fix call to setup_timer() 2010-07-15 23:51:03 -07:00
wacom_w8001.c Input: wacom_w8001 - add single-touch support 2011-01-11 01:07:44 -08:00
wm97xx-core.c Input: wm97xx-core - add retries to wm97xx_read_aux_adc 2010-09-05 12:14:36 -07:00
wm9705.c Merge branch 'next' into for-linus 2008-10-15 23:29:12 -04:00
wm9712.c Merge branch 'next' into for-linus 2008-10-15 23:29:12 -04:00
wm9713.c Merge branch 'next' into for-linus 2008-10-15 23:29:12 -04:00
zylonite-wm97xx.c Input: wm97xx - provide coordinate logs for accelerated I/O 2010-01-28 22:38:30 -08:00