Merge branch 'console-fixes' into drm-next
commit62cd2fa82a38cb3d653517822c62a39cdbb5f365
authorDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 02:13:43 +0000 (8 12:13 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 02:13:43 +0000 (8 12:13 +1000)
treeb5d2f198c14455822c8b03abde2c8d8080cda24a
parent6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7
parentae1287865f5361fa138d4d3b1b6277908b54eac9
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)
drivers/tty/vt/vt.c
drivers/video/console/fbcon.c
include/linux/vt_kern.h