Pull input changes from Henrik Rydberg, including large update to

atmel_mxt_ts driver by Daniel and MT protocol addition for win8 devices.

Conflicts:
	drivers/input/touchscreen/atmel_mxt_ts.c

diff --cc drivers/input/touchscreen/atmel_mxt_ts.c
index 25fd056,3ad942c..4623cc6
--- 1/drivers/input/touchscreen/atmel_mxt_ts.c
--- 2/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@@ -1144,13 -1167,8 +1167,9 @@@ static int __devinit mxt_probe(struct i
        input_set_drvdata(input_dev, data);
        i2c_set_clientdata(client, data);
  
-       error = mxt_initialize(data);
-       if (error)
-               goto err_free_object;
- 
        error = request_threaded_irq(client->irq, NULL, mxt_interrupt,
 -                      pdata->irqflags, client->name, data);
 +                                   pdata->irqflags | IRQF_ONESHOT,
-                                    client->dev.driver->name, data);
++                                   client->name, data);
        if (error) {
                dev_err(&client->dev, "Failed to register interrupt\n");
                goto err_free_object;

diff --cc include/linux/input.h
Simple merge