Merge 4.1-rc4 into tty-next

This resolves some tty driver merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2015-05-18 14:08:58 -07:00
commit 02730d3c05
549 changed files with 6107 additions and 4875 deletions