Paul Mundt a6b5825aa7 Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux ... Conflicts: drivers/video/omap2/dss/dsi.c drivers/video/omap2/dss/dss_features.c drivers/video/omap2/dss/dss_features.h Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2011-05-24 15:35:54 +09:00
..
mach	Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux	2011-05-24 15:35:54 +09:00