diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:23:15 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-10 07:23:15 -0800 |
| commit | c228c8e94b9e56032d475abc8f5978a73ac3f699 (patch) | |
| tree | a3045c46c383f00d3fd7bcefee16c10c68643953 /drivers/staging/rtl8712/usb_intf.c | |
| parent | 1388239cd22fcaf1572a12197faa14a63d45aa27 (diff) | |
| parent | 5d7b0fcc26d66db767a477574effc764022c19ac (diff) | |
Merge tag 'v3.14.58' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.14lsk-v3.14-16.01lsk-v3.14-15.12
This is the 3.14.58 stable release
# gpg: Signature made Wed Dec 9 10:43:44 2015 PST using RSA key ID 6092693E
# gpg: Good signature from "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>"
* tag 'v3.14.58' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (38 commits)
Linux 3.14.58
ALSA: usb-audio: work around CH345 input SysEx corruption
ALSA: usb-audio: prevent CH345 multiport output SysEx corruption
ALSA: usb-audio: add packet size quirk for the Medeli DD305
USB: option: add XS Stick W100-2 from 4G Systems
USB: serial: option: add support for Novatel MiFi USB620L
USB: ti_usb_3410_5052: Add Honeywell HGI80 ID
usb: musb: core: fix order of arguments to ulpi write callback
usblp: do not set TASK_INTERRUPTIBLE before lock
arm64: Fix compat register mappings
can: sja1000: clear interrupts on start
Bluetooth: ath3k: Add support of AR3012 0cf3:817b device
Bluetooth: ath3k: Add new AR3012 0930:021c id
Bluetooth: hidp: fix device disconnect on idle timeout
staging: rtl8712: Add device ID for Sitecom WLA2100
mwifiex: fix mwifiex_rdeeprom_read()
net: mvneta: Fix CPU_MAP registers initialisation
mac80211: fix driver RSSI event calculations
x86/cpu: Fix SMAP check in PVOPS environments
x86/cpu: Call verify_cpu() after having entered long mode too
...
Diffstat (limited to 'drivers/staging/rtl8712/usb_intf.c')
| -rw-r--r-- | drivers/staging/rtl8712/usb_intf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index bbd5888e316b..11c7fcc1048f 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -144,6 +144,7 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = { {USB_DEVICE(0x0DF6, 0x0058)}, {USB_DEVICE(0x0DF6, 0x0049)}, {USB_DEVICE(0x0DF6, 0x004C)}, + {USB_DEVICE(0x0DF6, 0x006C)}, {USB_DEVICE(0x0DF6, 0x0064)}, /* Skyworth */ {USB_DEVICE(0x14b2, 0x3300)}, |