Jiri Kosina 07f9479a40 Merge branch 'master' into for-next ...

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

2011-04-26 10:22:59 +02:00

..

bitblit.c

fbcon: uninline four foo_update_attr() functions

2010-08-11 08:59:09 -07:00

dummycon.c

…

fbcon_ccw.c

fbcon: uninline four foo_update_attr() functions

2010-08-11 08:59:09 -07:00

fbcon_cw.c

fbcon: uninline four foo_update_attr() functions

2010-08-11 08:59:09 -07:00

fbcon_rotate.c

…

fbcon_rotate.h

…

fbcon_ud.c

fbcon: uninline four foo_update_attr() functions

2010-08-11 08:59:09 -07:00

fbcon.c

fbcon: Remove unused 'display *p' variable from fb_flashcursor()

2011-03-31 13:48:54 +09:00

fbcon.h

…

font_6x11.c

…

font_7x14.c

…

font_8x8.c

…

font_8x16.c

…

font_10x18.c

…

font_acorn_8x8.c

…

font_mini_4x6.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

font_pearl_8x8.c

…

font_sun8x16.c

…

font_sun12x22.c

…

fonts.c

…

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

Makefile

…

mdacon.c

…

newport_con.c

update David Miller's old email address

2011-04-06 06:19:38 -07:00

softcursor.c

…

sticon.c

…

sticore.c

…

tileblit.c

fbcon: Bugfix soft cursor detection in Tile Blitting

2011-03-22 16:41:08 +09:00

vgacon.c

video: fix some comments in drivers/video/console/vgacon.c

2011-01-25 15:10:21 +09:00