summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' into for-linusDmitry Torokhov2014-12-151-4/+4
|\
| * Input: initialize device counter variables with -1Aniroop Mathur2014-12-031-4/+4
* | Input: xpad - use proper endpoint typeGreg Kroah-Hartman2014-11-251-3/+13
* | Input: xpad - add Thrustmaster as Xbox 360 controller vendorTommi Rantala2014-10-161-0/+1
* | Input: xpad - add USB ID for Thrustmaster Ferrari 458 Racing WheelTommi Rantala2014-10-161-0/+1
|/
* Input: joystick - use ktime for measuring timingTakashi Iwai2014-09-111-19/+52
* Input: xpad - sync device IDs with xboxdrvBenjamin Valentin2014-09-081-0/+33
* Input: xpad - add VID/PID for Razer SabertoothFrank Razenberg2014-09-081-0/+1
* Merge branch 'next' into for-linusDmitry Torokhov2014-08-141-17/+157
|\
| * Input: xpad - add support for Xbox One controllersTed Mielczarek2014-08-131-17/+157
* | Input: joystick - use get_cycles on ARMv8Mark Brown2014-08-121-1/+1
|/
* Merge branch 'next' into for-linusDmitry Torokhov2014-01-2320-20/+0
|\
| * Input: delete non-required instances of include <linux/init.h>Paul Gortmaker2014-01-0620-20/+0
| * Merge tag 'v3.11' into nextDmitry Torokhov2013-09-181-1/+2
| |\
* | | Input: xpad - add new USB IDs for Logitech F310 and F710Petr Sebor2014-01-021-0/+2
* | | Input: xpad - change D-PAD mapping on Razer devicesThomaz de Oliveira dos Reis2014-01-021-2/+2
* | | Merge branch 'next' into for-linusDmitry Torokhov2013-09-062-3/+4
|\| | | |/ |/|
| * Input: as5011 - fix error return code in as5011_probe()Wei Yongjun2013-08-241-0/+1
| * Input: joysticks - use dev_get_platdata()Jingoo Han2013-08-122-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/+2
|\|
| * input/joystick: use get_cycles on ARMArnd Bergmann2013-03-141-6/+2
* | Input: xpad - fix for "Mad Catz Street Fighter IV FightPad" controllersShawn Joseph2013-06-181-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-191-36/+46
| |\
| | * Input: walkera0701 - claim parport when opening the deviceDmitry Torokhov2013-01-211-10/+6
| | * Input: walkera0701 - use proper error codesDmitry Torokhov2013-01-211-20/+36
| | * Input: walkera0701 - switch to using pr_xxx() for messagesDmitry Torokhov2013-01-211-13/+10
| | * Input: walkera0701 - set up input device's parentDmitry Torokhov2013-01-211-0/+1
* | | drivers/input/joystick/analog.c: enable precise timerChris Metcalf2013-02-041-1/+1
|/ /
* | Merge branch 'next' into for-linusDmitry Torokhov2012-12-163-14/+28
|\|
| * Input: walkera0701 - fix crash on startupPeter Popovec2012-12-161-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-031-9/+18
* | | | Input: xpad - minor formatting fixesGuillermo A. Amaral2012-12-031-3/+3
* | | | Merge branch 'next' into for-linusDmitry Torokhov2012-07-246-24/+50
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'for-linus' to bring in change ensuring that drivers thatDmitry Torokhov2012-07-071-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/+18
| |\ \
| * | | USB: input: xpad.c: fix up dev_* messagesGreg Kroah-Hartman2012-05-041-3/+5
| * | | USB: input: iforce: fix up dev_* messagesGreg Kroah-Hartman2012-05-043-5/+7
| * | | USB: xpad.c: remove dbg() usageGreg Kroah-Hartman2012-05-011-11/+19
| * | | USB: iforce: remove dbg() usageGreg Kroah-Hartman2012-05-012-8/+12
| * | | USB: input: xpad.c: fix up dev_err() usageGreg Kroah-Hartman2012-05-011-2/+2
| * | | USB: input: joystick: iforce: fix up dev_err() usagesGreg Kroah-Hartman2012-05-012-2/+2