original_kernel/drivers/input/mouse
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
..
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
Makefile
alps.c
alps.h
amimouse.c
appletouch.c Revert "Input: appletouch - fix integer overflow issue" 2010-08-09 13:48:08 +10:00
atarimouse.c
bcm5974.c Input: bcm5974 - adjust major/minor to scale 2010-08-31 18:00:02 -07:00
elantech.c Input: elantech - report position also with 3 fingers 2010-08-05 23:53:22 -07:00
elantech.h Input: elantech - discard the first 2 positions on some firmwares 2010-08-05 23:52:29 -07:00
gpio_mouse.c
hgpk.c
hgpk.h
inport.c
lifebook.c
lifebook.h
logibm.c
logips2pp.c
logips2pp.h
maplemouse.c
pc110pad.c Input: switch to input_abs_*() access functions 2010-08-02 20:29:56 -07:00
psmouse-base.c param: use ops in struct kernel_param, rather than get and set fns directly 2010-08-11 23:04:13 +09:30
psmouse.h
pxa930_trkball.c
rpcmouse.c
sentelic.c
sentelic.h
sermouse.c
synaptics.c Merge branch 'next' into for-linus 2010-08-10 08:41:58 -07:00
synaptics.h
synaptics_i2c.c
touchkit_ps2.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
touchkit_ps2.h
trackpoint.c
trackpoint.h
vsxxxaa.c