tree 6d2f9b96d9842540a551ab2a05baf8045f774176
parent b9c2b05022152ccec9a0c5987739a3e891e7d621
parent 5c0a2450d695bbe32b1fb81c07751bcbea64f084
author Linus Torvalds <torvalds@linux-foundation.org> 1393180790 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1393180790 -0800
mergetag object 5c0a2450d695bbe32b1fb81c07751bcbea64f084
 type commit
 tag tty-3.14-rc4
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1393110136 -0800
 
 TTY patch revert for 3.14-rc4
 
 Here is a single commit, a revert of a sysfs file change that ended up
 breaking a userspace tool.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iEYEABECAAYFAlMJLK0ACgkQMUfUDdst+ynREQCcCl2HBK30ux8vwP0+tLvyx3AJ
 lQYAn1COffBg1KS22gYyhm0Yez2pUgN2
 =ZmpJ
 -----END PGP SIGNATURE-----

Merge tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/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"