Skip to content
Commit 6e87b703 authored by Rob Herring's avatar Rob Herring
Browse files

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty into for-next 

Conflicts:
	arch/arm64/kernel/early_printk.c
parents eafd370d e26f1db9
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment