From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Nov 2014 00:03:24 +0000 (-0800)
Subject: Merge tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: Ubuntu-5.10.0-12.13~15825
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6f93840d562bec2b0cb6142db675f3894333fc42;hp=-c;p=mirror_ubuntu-hirsute-kernel.git

Merge tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial fix from Greg KH:
 "Here is a single revert for the of-serial driver that resolves a
  reported issue.

  This revert has been in linux-next for a while"

* tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "serial: of-serial: add PM suspend/resume support"
---

6f93840d562bec2b0cb6142db675f3894333fc42