Merge tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Nov 2014 00:03:24 +0000 (16:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Nov 2014 00:03:24 +0000 (16:03 -0800)
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"


Trivial merge