Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
linux/drivers/input/touchscreen
History
Linus Torvalds 229aebb873 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: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
 		2010-10-24 13:41:39 -07: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 input: STMPE touch controller support 2010-08-12 11:27:56 +02:00
Makefile input: STMPE touch controller support 2010-08-12 11:27:56 +02:00
ad7877.c Input: ad7877 - fix spi word size to 16 bit 2010-06-08 01:13:05 -07:00
ad7879-i2c.c Input: ad7879 - use i2c_smbus_read_i2c_block_data() to lower overhead 2010-07-03 13:13:19 -07: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 - report EV_KEY/BTN_TOUCH events 2010-07-03 13:13:20 -07:00
ad7879.h Input: ad7879 - add open and close methods 2010-07-03 13:13:14 -07:00
ads7846.c Input: ads7846 - extend the driver for ads7845 controller support 2010-07-03 13:13:22 -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
…
cy8ctmg110_ts.c Input: cy8ctmg100_ts - signedness bug 2010-08-10 08:37:37 -07: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
…
eeti_ts.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
elo.c
…
fujitsu_ts.c
…
gunze.c
…
h3600_ts_input.c
…
hampshire.c Input: add driver for hampshire serial touchscreens 2010-04-13 23:27:41 -07:00
hp680_ts_input.c
…
htcpen.c
…
inexio.c
…
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
mainstone-wm97xx.c
…
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: mcs - Add MCS touchkey driver 2010-07-04 01:23:26 -07:00
migor_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
mk712.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
mtouch.c
…
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
…
qt602240_ts.c Input: Add ATMEL QT602240 touchscreen driver 2010-07-14 21:58:52 -07:00
s3c2410_ts.c Input: s3c2410_ts - tone down logging 2010-05-31 11:59:53 -07:00
stmpe-ts.c touchscreen: Fix sign bug 2010-08-12 11:27:59 +02:00
touchit213.c
…
touchright.c
…
touchwin.c
…
tps6507x-ts.c Input: tps6507x-ts - remove unneeded NULL test 2010-06-23 09:44:51 -07:00
tsc2007.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02: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 - implement reset_resume 2010-07-15 09:30:57 -07:00
w90p910_ts.c Input: w90p910_ts - fix call to setup_timer() 2010-07-15 23:51:03 -07:00
wacom_w8001.c
…
wm97xx-core.c Input: wm9712 - fix wm97xx_set_gpio() logic 2010-05-19 10:13:35 -07:00
wm9705.c
…
wm9712.c
…
wm9713.c
…
zylonite-wm97xx.c
…