From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 16 May 2014 05:09:53 +0000 (+1000)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20140516~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d94f47e8b4c0ce846ac2d0ddad9611f8a22ea6c6;p=karo-tx-linux.git

Merge remote-tracking branch 'tty/tty-next'

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

d94f47e8b4c0ce846ac2d0ddad9611f8a22ea6c6