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

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

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

e759eae1f530ee56dcaffddf0c5bbcff9161ae20