From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Feb 2015 19:37:02 +0000 (-0800)
Subject: Merge tag 'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a9724125ad014decf008d782e60447c811391326;p=deliverable%2Flinux.git

Merge tag 'tty-3.20-rc1' of git://git./linux/kernel/git/gregkh/tty

Pull tty/serial driver patches from Greg KH:
 "Here's the big tty/serial driver update for 3.20-rc1.  Nothing huge
  here, just lots of driver updates and some core tty layer fixes as
  well.  All have been in linux-next with no reported issues"

* tag 'tty-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits)
  serial: 8250: Fix UART_BUG_TXEN workaround
  serial: driver for ETRAX FS UART
  tty: remove unused variable sprop
  serial: of-serial: fetch line number from DT
  serial: samsung: earlycon support depends on CONFIG_SERIAL_SAMSUNG_CONSOLE
  tty/serial: serial8250_set_divisor() can be static
  tty/serial: Add Spreadtrum sc9836-uart driver support
  Documentation: DT: Add bindings for Spreadtrum SoC Platform
  serial: samsung: remove redundant interrupt enabling
  tty: Remove external interface for tty_set_termios()
  serial: omap: Fix RTS handling
  serial: 8250_omap: Use UPSTAT_AUTORTS for RTS handling
  serial: core: Rework hw-assisted flow control support
  tty/serial: 8250_early: Add support for PXA UARTs
  tty/serial: of_serial: add support for PXA/MMP uarts
  tty/serial: of_serial: add DT alias ID handling
  serial: 8250: Prevent concurrent updates to shadow registers
  serial: 8250: Use canary to restart console after suspend
  serial: 8250: Refactor XR17V35X divisor calculation
  serial: 8250: Refactor divisor programming
  ...
---

a9724125ad014decf008d782e60447c811391326
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 1eb6444a48c4,388809c5e381..cba613f8aa4f
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -37,8 -35,8 +37,9 @@@ chrp	Common Hardware Reference Platfor
  chunghwa	Chunghwa Picture Tubes Ltd.
  cirrus	Cirrus Logic, Inc.
  cnm	Chips&Media, Inc.
+ cnxt	Conexant Systems, Inc.
  cortina	Cortina Systems, Inc.
 +cosmic	Cosmic Circuits
  crystalfontz	Crystalfontz America, Inc.
  dallas	Maxim Integrated Products (formerly Dallas Semiconductor)
  davicom	DAVICOM Semiconductor, Inc.