Merge 3.7-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:26:00 +0000 (18:26 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:26:00 +0000 (18:26 -0800)

Trivial merge