aboutsummaryrefslogtreecommitdiff
path: root/Documentation/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2014-11-26 10:41:46 -0800
committerGreg Kroah-Hartman2014-11-26 10:41:46 -0800
commit9f10adc54450e246bbbb63cd152a941873068567 (patch)
tree87a70488a65c767d6af2da28b00995273a53acc1 /Documentation/usb
parent6629467ba5502cac22d31950e207a0334f2a0de5 (diff)
parente7181d005e84b15fe3121a8d22840adc3395d496 (diff)
Merge tag 'usb-serial-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes: USB-serial updates for v3.19-rc1 These changes add a new "simple" driver for Google USB-serial devices and add support for Huawei Gobi modems to qcserial. Included are also some removals of unnecessary atomic allocations and a few spelling fixes. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'Documentation/usb')
-rw-r--r--Documentation/usb/usb-serial.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index 5bd7926185e8..947fa62bccf2 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -145,7 +145,7 @@ Keyspan PDA Serial Adapter
Single port DB-9 serial adapter, pushed as a PDA adapter for iMacs (mostly
sold in Macintosh catalogs, comes in a translucent white/green dongle).
Fairly simple device. Firmware is homebrew.
- This driver also works for the Xircom/Entrgra single port serial adapter.
+ This driver also works for the Xircom/Entrega single port serial adapter.
Current status:
Things that work: