Merge branch 'console-fixes' into drm-next
authorDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 02:13:43 +0000 (12:13 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 02:13:43 +0000 (12:13 +1000)
(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)

1  2 
drivers/tty/vt/vt.c
drivers/video/console/fbcon.c
include/linux/vt_kern.h

Simple merge
Simple merge
Simple merge