Skip to content
Commit 874f2f99 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin/master' into next 

Manual merge of:
	drivers/char/hvc_console.c
	drivers/char/hvc_console.h
parents 071c06cb 6ebdc661
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment