From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Jan 2014 02:50:24 +0000 (-0800)
Subject: Merge tag 'tty-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v5.15~18547
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ad48ee810335bdd99de96e1a0796ba34c0e8301;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull serial fixes from Greg KH:
 "Here are tiny and assorted serial driver fixes that have been in a
  branch in my tree for a while and somehow did not get properly merged
  into my big TTY / Serial pull request for 3.14-rc1.  Sorry about that.

  All have been in linux-next for a while with no issues"

* tag 'tty-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: xuartps: Properly guard sysrq specific code
  serial: 8250: Fix initialisation of Quatech cards with the AMCC PCI chip
  serial: icom: dereference after free in load_code()
  serial: 8250_dw: add new ACPI IDs
  tty: serial: pch: don't crash if DMA enabled but not loaded
  serial: samsung: move clock deactivation below uart registration
---

2ad48ee810335bdd99de96e1a0796ba34c0e8301