staging: drm/omap: updates for DSS fifomerge API changes
authorRob Clark <rob@ti.com>
Mon, 16 Jan 2012 18:51:18 +0000 (12:51 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Feb 2012 22:14:11 +0000 (14:14 -0800)
Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/omapdrm/omap_crtc.c
drivers/staging/omapdrm/omap_drv.h
drivers/staging/omapdrm/omap_plane.c

Simple merge
Simple merge
Simple merge