From: Florian Tobias Schandinat Date: Wed, 25 Jul 2012 08:55:46 +0000 (+0000) Subject: Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev... X-Git-Tag: v3.6-rc1~16^2~11 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d9053b487965042b9c849ce40c7f1fb7a0b84b39;p=linux-block.git Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next Conflicts: drivers/video/omap2/dss/core.c drivers/video/omap2/dss/dispc.c --- d9053b487965042b9c849ce40c7f1fb7a0b84b39