From: Rob Herring 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: v3.16-rc1~47^2~21^2~2^2~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into for-next Conflicts: arch/arm64/kernel/early_printk.c --- 6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7