Merge 3.0-rc2 into tty-linus
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 6 Jun 2011 15:08:28 +0000 (08:08 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 6 Jun 2011 15:08:38 +0000 (08:08 -0700)
This is needed to catch the tty patch revert in the 3.0-rc2 tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge