original_kernel/drivers/input/touchscreen
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
Kconfig
Makefile
ad7877.c
ad7879-i2c.c
ad7879-spi.c
ad7879.c
ad7879.h
ads7846.c
atmel-wm97xx.c
atmel_tsadcc.c
cy8ctmg110_ts.c
da9034-ts.c
dynapro.c
eeti_ts.c
elo.c
fujitsu_ts.c
gunze.c
h3600_ts_input.c
hampshire.c
hp680_ts_input.c
htcpen.c
inexio.c
jornada720_ts.c
mainstone-wm97xx.c
mc13783_ts.c
mcs5000_ts.c
migor_ts.c
mk712.c
mtouch.c
pcap_ts.c
penmount.c
qt602240_ts.c
s3c2410_ts.c
stmpe-ts.c
touchit213.c
touchright.c
touchwin.c
tps6507x-ts.c
tsc2007.c
ucb1400_ts.c
usbtouchscreen.c
w90p910_ts.c
wacom_w8001.c
wm97xx-core.c
wm9705.c
wm9712.c
wm9713.c
zylonite-wm97xx.c