From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 26 Mar 2007 21:34:11 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v2.6.21-rc6~116
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8b66a454bf09958b474d12981996287d19aa462d;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: fix usb-serial/ftdi build warning
  USB: fix usb-serial/generic build warning
  USB: another entry for the quirk list
  USB: remove duplicated device id in airprime driver
  USB: omap_udc: workaround dma_free_coherent() bogosity
  UHCI: Fix problem caused by lack of terminating QH
---

8b66a454bf09958b474d12981996287d19aa462d