From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 26 Feb 2010 03:41:00 +0000 (+1100)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: firefly_0821_release~9833^2~3093^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=874f2f997dbe041a6c6e509dae8656ed9022d65d;p=firefly-linux-kernel-4.4.55.git

Merge commit 'origin/master' into next

Manual merge of:
	drivers/char/hvc_console.c
	drivers/char/hvc_console.h
---

874f2f997dbe041a6c6e509dae8656ed9022d65d