Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics - fix touchpad not working after S2R on Vostro V13
  Input: cma3000_d0x - fix signedness bug in cma3000_thread_irq()
  Input: wacom - add product id used by Samsung Slate 7

diff --combined drivers/input/misc/cma3000_d0x.c
index 80793f1,09f8f20..06517e6
--- 1/drivers/input/misc/cma3000_d0x.c
--- 2/drivers/input/misc/cma3000_d0x.c
+++ b/drivers/input/misc/cma3000_d0x.c
@@@ -23,7 -23,6 +23,7 @@@
  #include <linux/slab.h>
  #include <linux/input.h>
  #include <linux/input/cma3000.h>
 +#include <linux/module.h>
  
  #include "cma3000_d0x.h"
  
@@@ -115,8 -114,8 +115,8 @@@ static void decode_mg(struct cma3000_ac
  static irqreturn_t cma3000_thread_irq(int irq, void *dev_id)
  {
        struct cma3000_accl_data *data = dev_id;
-       int datax, datay, dataz;
-       u8 ctrl, mode, range, intr_status;
+       int datax, datay, dataz, intr_status;
+       u8 ctrl, mode, range;
  
        intr_status = CMA3000_READ(data, CMA3000_INTSTATUS, "interrupt status");
        if (intr_status < 0)