iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81280572ca
linux/drivers/input/joystick
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
..
iforce Input: iforce - fix Guillemot Jet Leader 3D entry 2010-05-10 22:54:39 -07:00
a3d.c Input: switch to input_abs_*() access functions 2010-08-02 20:29:56 -07:00
adi.c Input: switch to input_abs_*() access functions 2010-08-02 20:29:56 -07:00
amijoy.c Input: fix faulty XXinput_* calls 2010-08-13 12:03:24 -07:00
analog.c i8253: Convert i8253_lock to raw_spinlock 2010-03-02 10:28:38 +01:00
cobra.c Input: gameport - check return value of gameport_register_driver() 2008-07-30 00:41:36 -04:00
db9.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
gamecon.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
gf2k.c Input: switch to input_abs_*() access functions 2010-08-02 20:29:56 -07:00
grip_mp.c Input: gameport - check return value of gameport_register_driver() 2008-07-30 00:41:36 -04:00
grip.c Input: gameport - check return value of gameport_register_driver() 2008-07-30 00:41:36 -04:00
guillemot.c Input: gameport - check return value of gameport_register_driver() 2008-07-30 00:41:36 -04:00
interact.c Input: switch to input_abs_*() access functions 2010-08-02 20:29:56 -07:00
joydump.c Input: gameport - check return value of gameport_register_driver() 2008-07-30 00:41:36 -04:00
Kconfig Input: gamecon - add rumble support for N64 pads 2010-02-21 22:09:43 -08:00
magellan.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
Makefile Input: add support for Maple controller as a joystick 2008-12-30 00:58:05 -08:00
maplecontrol.c sh: maple: Support block reads and writes. 2009-02-27 16:07:32 +09:00
sidewinder.c Input: switch to input_abs_*() access functions 2010-08-02 20:29:56 -07:00
spaceball.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
spaceorb.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
stinger.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
tmdc.c Input: gameport - check return value of gameport_register_driver() 2008-07-30 00:41:36 -04:00
turbografx.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
twidjoy.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
walkera0701.c Input: add joystick driver for Walkera WK-0701 RC transmitter 2008-11-19 16:55:40 -05:00
warrior.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
xpad.c Merge branch 'next' into for-linus 2010-08-10 08:41:58 -07:00
zhenhua.c Input: add Zhen Hua driver 2008-04-15 13:26:52 -04:00