]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 23 Dec 2007 21:06:32 +0000 (13:06 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 23 Dec 2007 21:06:32 +0000 (13:06 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: New device ID for the CP2101 driver
  USB: VID/PID update for sierra
  USB: Unbreak fsl_usb2_udc


Trivial merge