From: Tony Lindgren Date: Thu, 10 May 2012 18:23:11 +0000 (-0700) Subject: Merge tag 'omap-cleanup-dss-for-v3.5' into tmp-merge X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b67dcbab75a48e05a8b2d1fd8d2a78695b724847;p=pandora-kernel.git Merge tag 'omap-cleanup-dss-for-v3.5' into tmp-merge Clean up for omap DSS board init in preparation for adding DT support. Conflicts: arch/arm/mach-omap2/board-omap4panda.c --- b67dcbab75a48e05a8b2d1fd8d2a78695b724847 Reading git-diff-tree failed