From: Linus Torvalds Date: Tue, 26 Jun 2007 23:49:42 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 X-Git-Tag: v2.6.22-rc7~49 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9a08e732533b940d2d31f4e9999dfee5e1ca3914;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: ftdio_sio: New IPlus device ID USB: add new device id to option driver USB: fix race leading to use after free in io_edgeport USB: usblcd doesn't limit memory consumption during write USB: memory leak in iowarrior.c USB: ti serial driver sleeps with spinlock held USB: g_file_storage: call allow_signal() --- 9a08e732533b940d2d31f4e9999dfee5e1ca3914