tree 4c6aa0a71c89b813c73c112391005fc00e44841a
parent 84fd7bdf1266ee6228319903af7e58702745024d
parent 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1351526457 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1351526457 -0700

Merge 3.7-rc3 into tty-next

This merges the tty changes in 3.7-rc3 into tty-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>