Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (24 commits) Input: ati_remote - use msec instead of jiffies Input: ati_remote - add missing input_sync() Input: ati_remote - relax permissions sysfs module parameters Input: ati_remote - make filter time a module parameter Input: atkbd - restore repeat rate when resuming Input: trackpoint - activate protocol when resuming Input: logips2pp - fix button mapping for MX300 Input: keyboard - change to use kzalloc Input: serio/gameport - check whether driver core calls succeeded Input: spaceball - make 4000FLX Lefty work Input: keyboard - simplify emulate_raw() implementation Input: keyboard - remove static variable and clean up initialization Input: hiddev - use standard list implementation Input: add missing handler->start() call Input: HID - fix potential out-of-bound array access Input: fix list iteration in input_release_device() Input: iforce - add Trust Force Feedback Race Master support Input: iforce - check array bounds before accessing elements Input: libps2 - warn instead of oopsing when passed bad arguments Input: fm801-gp - fix use after free ...
Showing
- drivers/char/keyboard.c 78 additions, 61 deletionsdrivers/char/keyboard.c
- drivers/input/evdev.c 3 additions, 7 deletionsdrivers/input/evdev.c
- drivers/input/gameport/fm801-gp.c 2 additions, 2 deletionsdrivers/input/gameport/fm801-gp.c
- drivers/input/gameport/gameport.c 49 additions, 17 deletionsdrivers/input/gameport/gameport.c
- drivers/input/input.c 44 additions, 13 deletionsdrivers/input/input.c
- drivers/input/joystick/iforce/iforce-main.c 10 additions, 9 deletionsdrivers/input/joystick/iforce/iforce-main.c
- drivers/input/joystick/spaceball.c 1 addition, 1 deletiondrivers/input/joystick/spaceball.c
- drivers/input/keyboard/atkbd.c 60 additions, 43 deletionsdrivers/input/keyboard/atkbd.c
- drivers/input/misc/wistron_btns.c 10 additions, 10 deletionsdrivers/input/misc/wistron_btns.c
- drivers/input/mouse/logips2pp.c 1 addition, 2 deletionsdrivers/input/mouse/logips2pp.c
- drivers/input/mouse/trackpoint.c 34 additions, 18 deletionsdrivers/input/mouse/trackpoint.c
- drivers/input/serio/libps2.c 5 additions, 0 deletionsdrivers/input/serio/libps2.c
- drivers/input/serio/serio.c 51 additions, 14 deletionsdrivers/input/serio/serio.c
- drivers/usb/input/ati_remote.c 99 additions, 74 deletionsdrivers/usb/input/ati_remote.c
- drivers/usb/input/hid-input.c 2 additions, 1 deletiondrivers/usb/input/hid-input.c
- drivers/usb/input/hiddev.c 38 additions, 34 deletionsdrivers/usb/input/hiddev.c
- include/linux/input.h 22 additions, 2 deletionsinclude/linux/input.h
Loading
Please register or sign in to comment