From: Dmitry Torokhov <dtor@insightbb.com>
Date: Fri, 8 Dec 2006 06:07:56 +0000 (-0500)
Subject: Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.20-rc1~34^2~412
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bef986502fa398b1785a3979b1aa17cd902d3527;p=linux-2.6-omap-h63xx.git

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/hid.h
---

bef986502fa398b1785a3979b1aa17cd902d3527
diff --cc drivers/input/mouse/psmouse-base.c
index e626b1e737f,52bb2226ce2..a0e4a033e2d
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@@ -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);
  
diff --cc drivers/usb/input/hid.h
index 8aa9ec08e8a,2a9bf07944c..76ad68d9edf
--- a/drivers/usb/input/hid.h
+++ b/drivers/usb/input/hid.h
@@@ -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