Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty...
authorRob Herring <robh@kernel.org>
Tue, 20 May 2014 19:22:54 +0000 (14:22 -0500)
committerRob Herring <robh@kernel.org>
Tue, 20 May 2014 19:22:54 +0000 (14:22 -0500)
commit6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7
treee01eaf5fcfed6767da9fcfd8f5120ef667c81bb8
parenteafd370dfe487facfdef499057f4eac9aa0b4bf5
parente26f1db9b8d74617519e50b41749900d0a257406
Merge branch 'tty-next' of git://git./linux/kernel/git/gregkh/tty into for-next

Conflicts:
arch/arm64/kernel/early_printk.c
drivers/tty/serial/8250/8250_core.c