Merge v3.7-rc5 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Nov 2012 20:30:12 +0000 (12:30 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Nov 2012 20:30:12 +0000 (12:30 -0800)
This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.


Trivial merge