From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 19 May 2014 06:00:03 +0000 (+1000)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20140519~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=57f6bd37bb0d66d10c19e142faa3dbbad994834c;p=karo-tx-linux.git

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

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

57f6bd37bb0d66d10c19e142faa3dbbad994834c