aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' into for-linusDmitry Torokhov2011-01-113-0/+378
|\
| * Input: add Austria Microsystem AS5011 joystick driverFabien Marteau2011-01-103-0/+378
* | Merge branch 'next' into for-linusDmitry Torokhov2011-01-062-64/+74
|\ \ | |/
| * Input: iforce - clean up MakefileDmitry Torokhov2010-11-221-12/+3
| * Input: xpad - ensure xpad->bulk_out is initialized before submitting urbAxel Lin2010-11-181-16/+16
| * Input: xpad - remove useless check in xpad_removeDmitry Torokhov2010-11-111-19/+18
| * Input: xpad - fix resource reclaim in xpad_probe error pathAxel Lin2010-11-111-12/+18
| * Input: xpad - fix a memory leakAxel Lin2010-11-111-2/+3
| * Input: xpad - return proper error in error pathAxel Lin2010-11-111-10/+23
* | Input: turbografx - fix reference countingNamhyung Kim2010-12-011-0/+1
|/
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-241-2/+1
|\
| * Update broken web addresses in the kernel.Justin P. Mattock2010-10-181-2/+1
* | Input: fix faulty XXinput_* callsDaniel Mack2010-08-131-1/+1
|/
* Merge branch 'next' into for-linusDmitry Torokhov2010-08-107-30/+32
|\
| * Input: xpad - add USB-ID for PL-3601 Xbox 360 padChristoph Fritz2010-08-101-0/+1
| * Input: switch to input_abs_*() access functionsDaniel Mack2010-08-026-30/+31
* | Merge branch 'next' into for-linusDmitry Torokhov2010-08-021-44/+63
|\ \ | |/
| * Input: xpad - remove mouse buttons and axes for dance padsChristoph Fritz2010-07-131-44/+63
* | Input: xpad - add product ID for Hori Fighting Stick EX2Chris Merrett2010-07-261-0/+1
* | Input: gamecon - reference correct pad in gc_psx_command()Dmitry Torokhov2010-07-201-1/+1
* | Input: gamecon - reference correct input device in NES modeDmitry Torokhov2010-07-201-2/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6Linus Torvalds2010-05-201-8/+8
|\
| * USB: rename usb_buffer_alloc() and usb_buffer_free() usersDaniel Mack2010-05-201-8/+8
* | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2010-05-181-2/+2
|\ \ | |/ |/|
| * Merge commit 'v2.6.34-rc6' into core/lockingIngo Molnar2010-05-033-1/+4
| |\
| * | i8253: Convert i8253_lock to raw_spinlockThomas Gleixner2010-03-021-2/+2
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-05-132-1/+6
|\ \ \ | |_|/ |/| |
| * | Input: iforce - fix Guillemot Jet Leader 3D entryMarek Vasut2010-05-101-1/+1
| * | Input: iforce - add Guillemot Jet Leader Force FeedbackMarek Vasut2010-05-102-0/+5
* | | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-303-0/+3
|/ /
* | Input: gamecon - fix off by one range checkDan Carpenter2010-03-051-1/+1
|/
* Input: gamecon - use pr_err() and friendsDmitry Torokhov2010-02-211-8/+10
* Input: gamecon - constify some of the setup structuresDmitry Torokhov2010-02-211-10/+10
* Input: gamecon - simplify pad type handlingDmitry Torokhov2010-02-211-79/+123
* Input: gamecon - simplify coordinate calculation for PSXDmitry Torokhov2010-02-211-4/+8
* Input: gamecon - fix some formatting issuesDmitry Torokhov2010-02-211-153/+194
* Input: gamecon - add rumble support for N64 padsScott Moreau2010-02-212-6/+120
* Input: xpad - add rumble support for original xbox controllerBenjamin Valentin2010-01-241-16/+37
* Merge commit 'v2.6.33-rc5' into nextDmitry Torokhov2010-01-215-47/+19
|\
| * Input: xbox - do not use GFP_KERNEL under spinlockDmitry Torokhov2010-01-091-2/+2
| * Input: gf2k - fix &&/|| confusion in gf2k_connect()Roel Kluin2010-01-011-1/+1
| * Input: iforce - wait for command completion when closing the deviceDmitry Torokhov2009-12-302-0/+4
| * Input: iforce - fix oops on device disconnectDmitry Torokhov2009-12-243-44/+12
* | Input: xpad - allow using triggers as buttons rather than axesNicolas Léveillé2009-12-291-79/+121
|/
* Input: xpad - add two new Xbox 360 devicesNicolas Léveillé2009-11-291-0/+3
* Input: xpad - add BigBen Interactive XBOX 360 ControllerThomas Gruber2009-10-051-0/+2
* Merge commit 'v2.6.31-rc8' into nextDmitry Torokhov2009-08-272-0/+2
|\
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2009-08-242-0/+2
| |\
| | * Input: iforce - support new revision of ACT LABS Force RSJiri Kosina2009-08-192-0/+2
* | | Input: xpad - add USB ID for the drumkit controller from Rock BandCorbin Simpson2009-08-201-0/+2
|/ /