From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Feb 2014 18:39:50 +0000 (-0800)
Subject: Merge tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v3.14-rc4~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0f13bd46ac4faa26a34fc33b457013d5b8a96f5;p=kernel%2Fkernel-generic.git

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

Pull TTY revert from Greg KH:
 "Here is a single commit, a revert of a sysfs file change that ended up
  breaking a userspace tool"

* tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "tty: Set correct tty name in 'active' sysfs attribute"
---

e0f13bd46ac4faa26a34fc33b457013d5b8a96f5