tree c7039c1d1005b80e427761ba768d7697ae4a0b72
parent 5d4121c04b3577e37e389b3553d442f44bb346d7
parent fea7a08acb13524b47711625eebea40a0ede69a0
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1346076813 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1346076813 -0700

Merge 3.6-rc3 into tty-next

This picks up all of the different fixes in Linus's tree that we also need here.

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