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)
commit163baa33552bb1c08b6bf109319505570658a8f3
treedb130209cf27ec72ecd5a7121a3c91543badc8f3
parenteb7073db1076777496495483854993165e14790f
parent59c5f46fbe01a00eedf54a23789634438bb80603
Merge 3.0-rc2 into tty-linus

This is needed to catch the tty patch revert in the 3.0-rc2 tree.

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