Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
displays	backlight: constify backlight_ops	2010-11-16 14:14:02 +01:00
dss	OMAP: DSS2: DSI: Remove extra iounmap in error path	2010-10-22 23:21:05 +03:00
omapfb	OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3	2010-10-22 23:21:07 +03:00
Kconfig	OMAP: DSS2: Add generic and Sharp panel drivers	2009-12-09 18:19:42 +02:00
Makefile	OMAP: DSS2: Add generic and Sharp panel drivers	2009-12-09 18:19:42 +02:00
vram.c	OMAP: DSS: VRAM: Align start & size of vram to 2M	2010-12-15 11:16:08 +02:00
vrfb.c	OMAP: Add support for VRFB rotation engine	2009-12-09 12:04:33 +02:00