Merge branch 'console-fixes' into drm-next

(not the fbcon maintainer pull 2)

fix bug in vgacon on bootup and fbcon losing fonts on startup.

* console-fixes: (50 commits)
  fbcon: don't lose the console font across generic->chip driver switch
  vgacon/vt: clear buffer attributes when we load a 512 character font (v2)

diff --cc drivers/tty/vt/vt.c
Simple merge

diff --cc drivers/video/console/fbcon.c
Simple merge

diff --cc include/linux/vt_kern.h
Simple merge