[git pull] Input updates for 3.14-rc8 (take 2)

[Dmitry Torokhov]

Hi Linus,

Please pull from:

	git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
or
	master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus

to receive 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.

Changelog:
---------

Dmitry Torokhov (1):
      Input: mousedev - fix race when creating mixed device

Elias Vanderstuyft (1):
      Input: don't modify the id of ioctl-provided ff effect on upload failure


Diffstat:
--------

 drivers/input/evdev.c    |  4 ++-
 drivers/input/mousedev.c | 73 ++++++++++++++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 32 deletions(-)


-- 
Dmitry

Attachment: pgpbvwqjsZbzu.pgp
Description: PGP signature