summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' into for-linusDmitry Torokhov2014-01-2320-20/+0Star
|\
| * Input: delete non-required instances of include <linux/init.h>Paul Gortmaker2014-01-0720-20/+0Star
| * Merge tag 'v3.11' into nextDmitry Torokhov2013-09-181-1/+2
| |\
* | | Input: xpad - add new USB IDs for Logitech F310 and F710Petr Sebor2014-01-031-0/+2
* | | Input: xpad - change D-PAD mapping on Razer devicesThomaz de Oliveira dos Reis2014-01-031-2/+2
* | | Merge branch 'next' into for-linusDmitry Torokhov2013-09-072-3/+4
|\| | | |/ |/|
| * Input: as5011 - fix error return code in as5011_probe()Wei Yongjun2013-08-251-0/+1
| * Input: joysticks - use dev_get_platdata()Jingoo Han2013-08-132-3/+3
* | Input: xpad - add signature for Razer Onza Classic EditionMag2013-08-261-0/+1
* | Merge branch 'next' into for-linusDmitry Torokhov2013-07-021-6/+2Star
|\|
| * input/joystick: use get_cycles on ARMArnd Bergmann2013-03-141-6/+2Star
* | Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllersShawn Joseph2013-06-191-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2013-02-201-36/+46
|\
| * Merge branch 'next' into for-linusDmitry Torokhov2013-02-201-36/+46
| |\
| | * Input: walkera0701 - claim parport when opening the deviceDmitry Torokhov2013-01-221-10/+6Star
| | * Input: walkera0701 - use proper error codesDmitry Torokhov2013-01-221-20/+36
| | * Input: walkera0701 - switch to using pr_xxx() for messagesDmitry Torokhov2013-01-221-13/+10Star
| | * Input: walkera0701 - set up input device's parentDmitry Torokhov2013-01-221-0/+1
* | | drivers/input/joystick/analog.c: enable precise timerChris Metcalf2013-02-041-1/+1
|/ /
* | Merge branch 'next' into for-linusDmitry Torokhov2012-12-173-14/+28
|\|
| * Input: walkera0701 - fix crash on startupPeter Popovec2012-12-171-3/+4
| * Input: remove use of __devexitBill Pemberton2012-11-242-2/+2
| * Input: remove use of __devinitBill Pemberton2012-11-242-4/+4
| * Input: remove use of __devexit_pBill Pemberton2012-11-242-2/+2
| * Input: as5011 - use C99-style structure initializatorsShubhrajyoti D2012-10-111-3/+16
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-07-131-1/+5
| |\
| * \ Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-07-061-2/+3
| |\ \
* | | | Input: xpad - add a few new VID/PID combinationsGuillermo A. Amaral2012-12-041-9/+18
* | | | Input: xpad - minor formatting fixesGuillermo A. Amaral2012-12-041-3/+3
* | | | Merge branch 'next' into for-linusDmitry Torokhov2012-07-256-24/+50
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'for-linus' to bring in change ensuring that drivers thatDmitry Torokhov2012-07-081-2/+3
| |\ \ \ | | |/ / | |/| / | | |/
| * | i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLINGMark Brown2012-05-301-0/+1
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-05-2418-248/+18Star
| |\ \
| * | | USB: input: xpad.c: fix up dev_* messagesGreg Kroah-Hartman2012-05-051-3/+5
| * | | USB: input: iforce: fix up dev_* messagesGreg Kroah-Hartman2012-05-053-5/+7
| * | | USB: xpad.c: remove dbg() usageGreg Kroah-Hartman2012-05-021-11/+19
| * | | USB: iforce: remove dbg() usageGreg Kroah-Hartman2012-05-022-8/+12
| * | | USB: input: xpad.c: fix up dev_err() usageGreg Kroah-Hartman2012-05-021-2/+2
| * | | USB: input: joystick: iforce: fix up dev_err() usagesGreg Kroah-Hartman2012-05-022-2/+2
| * | | USB: xpad.c: remove err() usageGreg Kroah-Hartman2012-04-251-4/+7
| * | | USB: iforce: remove err() usageGreg Kroah-Hartman2012-04-253-6/+12
* | | | Input: xpad - add Andamiro Pump It Up padYuri Khan2012-07-131-0/+1
* | | | Input: xpad - add signature for Razer Onza Tournament EditionIlia Katsnelson2012-07-111-1/+3
* | | | Input: xpad - handle all variations of Mad Catz Beat PadYuri Khan2012-07-111-0/+1
| |_|/ |/| |
* | | Input: request threaded-only IRQs with IRQF_ONESHOTLars-Peter Clausen2012-07-041-2/+3
| |/ |/|
* | Merge commit 'v3.4-rc4' into nextDmitry Torokhov2012-04-221-1/+0Star
|\|
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-03-301-0/+3
| |\
| * | Remove all #inclusions of asm/system.hDavid Howells2012-03-281-1/+0Star
* | | Input: gameport - use module_gameport_driverAxel Lin2012-04-0411-136/+11Star
* | | Input: serio - use module_serio_driverAxel Lin2012-04-047-112/+7Star
| |/ |/|