From: Paul Mundt Date: Tue, 24 May 2011 06:35:54 +0000 (+0900) Subject: Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux X-Git-Tag: v3.0-rc1~166^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6b5825aa703714523a745a8e050b9d6105f6704;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 --- a6b5825aa703714523a745a8e050b9d6105f6704