summaryrefslogtreecommitdiffstats
path: root/drivers/video/console
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2013-07-091-4/+13
|\
| * vgacon: fix missing include.Dave Airlie2013-06-271-0/+1
| * vgacon.c: add cond reschedule points in vgacon_do_font_opMarcelo Tosatti2013-06-261-4/+12
* | Merge branch 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2013-07-0313-31583/+10
|\ \
| * | lib: Move fonts from drivers/video/console/ to lib/fonts/Geert Uytterhoeven2013-06-2813-31577/+0
| * | console/font: Refactor font support code selection logicGeert Uytterhoeven2013-06-232-11/+15
| * | Revert "staging/solo6x10: depend on CONFIG_FONTS"Geert Uytterhoeven2013-06-231-2/+0
| * | console: Disable VGA text console support on crisGeert Uytterhoeven2013-06-161-1/+3
| |/
* | Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2013-07-021-1/+1
|\ \
| * | fbcon: queue work on power efficient wqViresh Kumar2013-05-141-1/+1
* | | Merge 3.10-rc3 into tty-nextGreg Kroah-Hartman2013-05-271-0/+2
|\ \ \ | | |/ | |/|
| * | staging/solo6x10: depend on CONFIG_FONTSArnd Bergmann2013-05-161-0/+2
| |/
* | TTY:vt: convert remain take_over_console's users to do_take_over_consoleWang YanQing2013-05-204-7/+18
* | fbcon: convert last two unregister_con_driver call to do_unregister_con_driverWang YanQing2013-05-201-1/+1
* | fbcon: delete unneeded function fbcon_takeoverWang YanQing2013-05-201-28/+0
* | fbcon: convert last fbcon_takeover call to do_fbcon_takeoverWang YanQing2013-05-201-1/+2
|/
* Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2013-05-021-0/+2
|\
| * fbcon: when font is freed, clear also vc_font.dataMika Kuoppala2013-04-241-0/+2
* | drivers/video/console/fbcon_cw.c: fix compiler warning in cw_update_attrDevendra Naga2013-04-291-2/+1
|/
* Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds2013-02-252-17/+63
|\
| * Merge branch 'console-fixes' into drm-nextDave Airlie2013-02-082-11/+25
| |\
| | * fbcon: don't lose the console font across generic->chip driver switchDave Airlie2013-02-071-4/+10
| | * vgacon/vt: clear buffer attributes when we load a 512 character font (v2)Dave Airlie2013-02-071-7/+15
| * | fbcon: fix locking harderDave Airlie2013-02-081-3/+8
| * | fb: Yet another band-aid for fixing lockdep messTakashi Iwai2013-02-081-2/+2
| * | fb: rework locking to fix lock ordering on takeoverAlan Cox2013-02-081-1/+28
| |/
* | Merge branch 'akpm' (incoming from Andrew)Linus Torvalds2013-02-211-1/+9
|\ \
| * | fbcon: clear the logo bitmap from the margin areaKamal Mostafa2013-02-211-1/+9
| |/
* / drivers/video/console: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-211-1/+1
|/
* Drivers: video: remove __dev* attributes.Greg Kroah-Hartman2013-01-031-46/+37
* Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds2012-12-151-2/+1
|\
| * drivers/video/console/softcursor.c: remove redundant NULL check before kfree()Sachin Kamat2012-12-101-2/+1
* | VIDEO: Newport Fix console crashesThomas Bogendoerfer2012-12-131-2/+9
|/
* drivers: console: font_: Change a glyph from "broken bar" to "vertical line"Bjarni Ingi Gislason2012-09-222-2/+2
* fbcon: Fix bit_putcs() call to kmalloc(s, GFP_KERNEL)Bruno Prémont2012-08-231-1/+1
* fbcon: prevent possible buffer overflow.Paul Cercueil2012-08-231-1/+1
* fbcon: fix race condition between console lock and cursor timer (v1.1)Dave Airlie2012-08-221-1/+8
* Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6Linus Torvalds2012-06-161-0/+14
|\
| * video/console: automatically select a fontArnd Bergmann2012-06-091-0/+14
* | parisc: move definition of PAGE0 to asm/page.hRolf Eike Beer2012-05-101-0/+2
|/
* Remove all #inclusions of asm/system.hDavid Howells2012-03-282-2/+0
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-01-141-19/+44
|\
| * MIPS: GIO bus support for SGI IP22/28Thomas Bogendoerfer2011-12-071-19/+44
* | Merge branch 'master' into for-nextJiri Kosina2011-11-131-21/+21
|\|
| * locking, video: Annotate vga console lock as rawThomas Gleixner2011-09-131-21/+21
* | Kconfig: remove a few puzzling commentsPaul Bolle2011-10-311-2/+0
|/
* Merge branch 'master' into for-nextJiri Kosina2011-04-263-6/+4
|\
| * Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-04-071-2/+0
| |\
| | * fbcon: Remove unused 'display *p' variable from fb_flashcursor()Sergey Senozhatsky2011-03-311-2/+0
| * | Fix common misspellingsLucas De Marchi2011-03-311-1/+1
| |/