Linus Torvalds 7c2db36e73 Merge branch 'akpm' (incoming from Andrew) ... Merge misc patches from Andrew Morton: - Florian has vanished so I appear to have become fbdev maintainer again :( - Joel and Mark are distracted to welcome to the new OCFS2 maintainer - The backlight queue - Small core kernel changes - lib/ updates - The rtc queue - Various random bits * akpm: (164 commits) rtc: rtc-davinci: use devm_*() functions rtc: rtc-max8997: use devm_request_threaded_irq() rtc: rtc-max8907: use devm_request_threaded_irq() rtc: rtc-da9052: use devm_request_threaded_irq() rtc: rtc-wm831x: use devm_request_threaded_irq() rtc: rtc-tps80031: use devm_request_threaded_irq() rtc: rtc-lp8788: use devm_request_threaded_irq() rtc: rtc-coh901331: use devm_clk_get() rtc: rtc-vt8500: use devm_*() functions rtc: rtc-tps6586x: use devm_request_threaded_irq() rtc: rtc-imxdi: use devm_clk_get() rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug() rtc: rtc-pcf8583: use dev_warn() instead of printk() rtc: rtc-sun4v: use pr_warn() instead of printk() rtc: rtc-vr41xx: use dev_info() instead of printk() rtc: rtc-rs5c313: use pr_err() instead of printk() rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug() rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug() rtc: rtc-ds2404: use dev_err() instead of printk() rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk() ...		2013-02-21 17:38:49 -08:00
..
bitblit.c	fbcon: Fix bit_putcs() call to kmalloc(s, GFP_KERNEL)	2012-08-23 12:29:32 +00: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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
fbcon_rotate.h	fbcon: fix rotate upside down crash	2009-08-07 10:39:55 -07:00
fbcon_ud.c	fbcon: uninline four foo_update_attr() functions	2010-08-11 08:59:09 -07:00
fbcon.c	fbcon: clear the logo bitmap from the margin area	2013-02-21 17:22:16 -08:00
fbcon.h	fb: add hooks to handle KDB enter/exit	2010-08-05 09:22:31 -05:00
font_6x11.c
font_7x14.c
font_8x8.c
font_8x16.c
font_10x18.c
font_acorn_8x8.c
font_mini_4x6.c	drivers: console: font_: Change a glyph from "broken bar" to "vertical line"	2012-09-22 21:14:22 +00:00
font_pearl_8x8.c
font_sun8x16.c	drivers: console: font_: Change a glyph from "broken bar" to "vertical line"	2012-09-22 21:14:22 +00:00
font_sun12x22.c
fonts.c
Kconfig	drivers/video/console: remove depends on CONFIG_EXPERIMENTAL	2013-01-21 14:52:45 -08:00
Makefile	sparc: Kill PROM console driver.	2009-09-15 17:04:38 -07:00
mdacon.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
newport_con.c	VIDEO: Newport Fix console crashes	2012-12-13 18:15:29 +01:00
softcursor.c	drivers/video/console/softcursor.c: remove redundant NULL check before kfree()	2012-12-10 11:33:53 +02:00
sticon.c
sticore.c	Drivers: video: remove __dev* attributes.	2013-01-03 15:57:01 -08:00
tileblit.c	fbcon: Bugfix soft cursor detection in Tile Blitting	2011-03-22 16:41:08 +09:00
vgacon.c	locking, video: Annotate vga console lock as raw	2011-09-13 11:12:04 +02:00