diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 07:43:16 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 07:43:16 -0700 |
commit | 78283dd29e647775cb1e63a4d6554b3090b9a9ff (patch) | |
tree | 46a179781ed356c0546379ecc46ca5daed7ae50a /drivers/usb/misc | |
parent | 435932f2c75efcdd07273a437b9be32647d56d73 (diff) | |
parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) | |
download | linux-78283dd29e647775cb1e63a4d6554b3090b9a9ff.tar.gz linux-78283dd29e647775cb1e63a4d6554b3090b9a9ff.tar.bz2 linux-78283dd29e647775cb1e63a4d6554b3090b9a9ff.zip |
Merge 3.11-rc3 into usb-next
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r-- | drivers/usb/misc/sisusbvga/sisusb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index c21386ec5d35..de98906f786d 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c @@ -3247,6 +3247,7 @@ static const struct usb_device_id sisusb_table[] = { { USB_DEVICE(0x0711, 0x0903) }, { USB_DEVICE(0x0711, 0x0918) }, { USB_DEVICE(0x0711, 0x0920) }, + { USB_DEVICE(0x0711, 0x0950) }, { USB_DEVICE(0x182d, 0x021c) }, { USB_DEVICE(0x182d, 0x0269) }, { } |