From: Rob Herring <robh@kernel.org>
Date: Tue, 20 May 2014 19:22:54 +0000 (-0500)
Subject: Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty... 
X-Git-Tag: firefly_0821_release~176^2~3785^2~21^2~2^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7;p=firefly-linux-kernel-4.4.55.git

Merge branch 'tty-next' of git://git./linux/kernel/git/gregkh/tty into for-next

Conflicts:
	arch/arm64/kernel/early_printk.c
---

6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7