Merge tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Feb 2014 18:39:50 +0000 (10:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Feb 2014 18:39:50 +0000 (10:39 -0800)
commite0f13bd46ac4faa26a34fc33b457013d5b8a96f5
tree6d2f9b96d9842540a551ab2a05baf8045f774176
parentb9c2b05022152ccec9a0c5987739a3e891e7d621
parent5c0a2450d695bbe32b1fb81c07751bcbea64f084
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"