Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Dmitry Torokhov [Fri, 8 Dec 2006 06:07:56 +0000 (01:07 -0500)]
Conflicts:

drivers/usb/input/hid.h

13 files changed:
1  2 
Documentation/DocBook/kernel-api.tmpl
drivers/input/gameport/gameport.c
drivers/input/keyboard/atkbd.c
drivers/input/keyboard/lkkbd.c
drivers/input/keyboard/sunkbd.c
drivers/input/mouse/psmouse-base.c
drivers/input/serio/serio.c
drivers/input/serio/serio_raw.c
drivers/input/touchscreen/ads7846.c
drivers/macintosh/Kconfig
drivers/usb/input/hid-core.c
drivers/usb/input/hid-input.c
drivers/usb/input/hid.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1118,10 -1119,10 +1119,10 @@@ static int psmouse_connect(struct seri
        psmouse = kzalloc(sizeof(struct psmouse), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!psmouse || !input_dev)
 -              goto out;
 +              goto err_free;
  
        ps2_init(&psmouse->ps2dev, serio);
-       INIT_WORK(&psmouse->resync_work, psmouse_resync, psmouse);
+       INIT_WORK(&psmouse->resync_work, psmouse_resync);
        psmouse->dev = input_dev;
        snprintf(psmouse->phys, sizeof(psmouse->phys), "%s/input0", serio->phys);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -260,7 -260,7 +260,8 @@@ struct hid_item 
  #define HID_QUIRK_POWERBOOK_HAS_FN            0x00001000
  #define HID_QUIRK_POWERBOOK_FN_ON             0x00002000
  #define HID_QUIRK_INVERT_HWHEEL                       0x00004000
- #define HID_QUIRK_BAD_RELATIVE_KEYS           0x00008000
+ #define HID_QUIRK_POWERBOOK_ISO_KEYBOARD      0x00008000
++#define HID_QUIRK_BAD_RELATIVE_KEYS           0x00010000
  
  /*
   * This is the global environment of the parser. This information is