From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Apr 2008 14:45:05 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
X-Git-Tag: v2.6.25~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1076bb40585dc3a4ae6143ecc5a1654495b84c42;p=linux-2.6

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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: remove broken usb-serial num_endpoints check
  USB: option: Add new vendor ID and device ID for AMOI HSDPA modem
  USB: support more Huawei data card product IDs
  USB: option.c: add more device IDs
  USB: Obscure Maxon BP3-USB Device Support 16d8:6280 for option driver
---

1076bb40585dc3a4ae6143ecc5a1654495b84c42