From: Greg Kroah-Hartman Date: Tue, 26 Jun 2012 23:04:29 +0000 (-0700) Subject: Merge 3.5-rc4 into tty-next X-Git-Tag: firefly_0821_release~3680^2~1976^2~199 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fc915c8b930c3114f2a838f7e2cd8789ad6fedc3;p=firefly-linux-kernel-4.4.55.git Merge 3.5-rc4 into tty-next This is to pick up the serial port and tty changes in Linus's tree to allow everyone to sync up. Signed-off-by: Greg Kroah-Hartman --- fc915c8b930c3114f2a838f7e2cd8789ad6fedc3