From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 22 Jan 2007 21:14:16 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v2.6.20-rc6~50
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=39470bf24d93927bb27929b9f0d52ff5d608cfcb;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: unusual_devs.h entry for nokia 6233
  USB: Fix for typo in ohci-ep93xx.c
  USB: disable USB_MULTITHREAD_PROBE
  USB: add vendor/device id for Option GT Max 3.6 cards
  USB: unusual_devs.h for 0x046b:ff40
  USB: make usbhid ignore Imation Disc Stakka
  USB: rndis_host: fix crash while probing a Nokia S60 mobile
  USB: asix: Detect internal PHY and enable/use accordingly
  usbtouchscreen: make ITM screens report BTN_TOUCH as zero when not touched
---

39470bf24d93927bb27929b9f0d52ff5d608cfcb