From: Greg Kroah-Hartman Date: Mon, 18 May 2015 21:08:58 +0000 (-0700) Subject: Merge 4.1-rc4 into tty-next X-Git-Tag: kvm-4.2-2~69^2~67 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=02730d3c053a9af1d402e1c8dc8bbbc5a1340406;p=users%2Fdwmw2%2Flinux.git Merge 4.1-rc4 into tty-next This resolves some tty driver merge issues. Signed-off-by: Greg Kroah-Hartman --- 02730d3c053a9af1d402e1c8dc8bbbc5a1340406