mirror of
https://github.com/hardkernel/linux.git
synced 2026-05-22 11:59:11 +09:00
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>