Jiri Kosina d014d04386 Merge branch 'for-next' into for-linus ...

Conflicts:

	kernel/irq/chip.c

2009-12-07 18:36:35 +01:00

..

bitblit.c

video: console, use DIV_ROUND_UP

2009-09-23 07:39:56 -07:00

dummycon.c

…

fbcon_ccw.c

…

fbcon_cw.c

…

fbcon_rotate.c

…

fbcon_rotate.h

fbcon: fix rotate upside down crash

2009-08-07 10:39:55 -07:00

fbcon_ud.c

…

fbcon.c

fb: remove fb_save_state() and fb_restore_state operations

2009-11-12 07:25:56 -08: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

…

font_pearl_8x8.c

…

font_sun8x16.c

…

font_sun12x22.c

…

fonts.c

…

Kconfig

sparc: Kill PROM console driver.

2009-09-15 17:04:38 -07:00

Makefile

sparc: Kill PROM console driver.

2009-09-15 17:04:38 -07:00

mdacon.c

…

newport_con.c

drivers/video/console/newport_con.c: fix read outside array bounds

2009-09-23 07:39:56 -07:00

softcursor.c

…

sticon.c

…

sticore.c

tree-wide: fix assorted typos all over the place

2009-12-04 15:39:55 +01:00

tileblit.c

…

vgacon.c

vgacon: prevent vgacon_deinit from touching the hardware for inactive consoles.

2009-09-23 07:39:57 -07:00