From: Linus Torvalds 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: firefly_0821_release~176^2~2810 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6f93840d562bec2b0cb6142db675f3894333fc42;p=firefly-linux-kernel-4.4.55.git Merge tag 'tty-3.18-rc7' of git://git./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