Merge branch 'for-linus' into next

Conflicts:

	drivers/input/mouse/appletouch.c

diff --cc drivers/input/keyboard/atkbd.c
Simple merge

diff --cc drivers/input/keyboard/pxa27x_keypad.c
Simple merge

diff --cc drivers/input/mouse/appletouch.c
index 6867c914b024da9518168829f5df9175c30f6075,ce6fdec19e148c0e250b9fb3f1e572197e31d120..1f41ae94f26bdf216a5f667e754b3c559831e7ed
--- 1/drivers/input/mouse/appletouch.c
--- 2/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@@ -564,8 -589,22 +564,23 @@@ static void atp_close(struct input_dev 
        dev->open = 0;
  }
  
 -      if (!atp_is_fountain(dev)) {
+ static int atp_handle_geyser(struct atp *dev)
+ {
+       struct usb_device *udev = dev->udev;
+ 
 -static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id)
++      if (dev->type != ATP_FOUNTAIN) {
+               /* switch to raw sensor mode */
+               if (atp_geyser_init(udev))
+                       return -EIO;
+ 
+               printk(KERN_INFO "appletouch: Geyser mode initialized.\n");
+       }
+ 
+       return 0;
+ }
+ 
 +static int atp_probe(struct usb_interface *iface,
 +                   const struct usb_device_id *id)
  {
        struct atp *dev;
        struct input_dev *input_dev;
@@@ -601,21 -640,14 +616,13 @@@
  
        dev->udev = udev;
        dev->input = input_dev;
 -      dev->overflowwarn = 0;
 -      if (atp_is_geyser_3(dev))
 -              dev->datalen = 64;
 -      else if (atp_is_geyser_2(dev))
 -              dev->datalen = 64;
 -      else
 +      dev->type = id->driver_info;
 +      dev->overflow_warned = false;
 +      if (dev->type == ATP_FOUNTAIN || dev->type == ATP_GEYSER1)
                dev->datalen = 81;
 +      else
 +              dev->datalen = 64;
  
-       if (dev->type != ATP_FOUNTAIN) {
-               /* switch to raw sensor mode */
-               if (atp_geyser_init(udev))
-                       goto err_free_devs;
- 
-               printk(KERN_INFO "appletouch: Geyser mode initialized.\n");
-       }
- 
        dev->urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!dev->urb)
                goto err_free_devs;

diff --cc drivers/input/serio/i8042-x86ia64io.h
Simple merge

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