Merge 3.10-rc7 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jun 2013 22:17:53 +0000 (15:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jun 2013 22:17:53 +0000 (15:17 -0700)
commit805bf3daf361a501594f8b27b394a8d7372ebe3c
treec71fe689115c7fa0f270d31fcef75fe61d81318c
parent64e377dcd7d75c241d614458e9619d3445de44ef
parent9e895ace5d82df8929b16f58e9f515f6d54ab82d
Merge 3.10-rc7 into tty-next

We want the tty fixes in this branch as well.

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