diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 04:20:40 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 04:20:40 +0400 |
| commit | 915ac4e26ef9c39a0f831e935509243732abedc0 (patch) | |
| tree | 68ac39fbf077217583f9936eada2c072301becb6 /drivers/iommu | |
| parent | aa4af831bb4f3168f2f574b2620124699c09c4a3 (diff) | |
| parent | e4dbedc7eac7da9db363a36f2bd4366962eeefcc (diff) | |
| download | linux-915ac4e26ef9c39a0f831e935509243732abedc0.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Some more updates for the input subsystem.
You will get a fix for race in mousedev that has been causing quite a
few oopses lately and a small fixup for force feedback support in
evdev"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: mousedev - fix race when creating mixed device
Input: don't modify the id of ioctl-provided ff effect on upload failure
Diffstat (limited to 'drivers/iommu')
0 files changed, 0 insertions, 0 deletions