Merge branch '3.8/misc-2'
Tomi Valkeinen [Mon, 5 Nov 2012 09:11:50 +0000 (11:11 +0200)]
Merge omapdss miscellaneous patches.

1  2 
drivers/video/omap2/dss/hdmi.c
include/video/omapdss.h

Simple merge
Simple merge