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

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/hamradio/6pack.c
Simple merge

diff --cc drivers/net/hamradio/mkiss.c
Simple merge

diff --cc drivers/net/usb/hso.c
Simple merge

diff --cc drivers/s390/char/sclp_vt220.c
Simple merge

diff --cc net/bluetooth/rfcomm/tty.c
Simple merge