tree 1fbb2559dd8fd400cf1dff5711cc5e408ea79ef6
parent 4c5b1fb8a1348542afb153aef72f6067989f578e
parent 974a65825e0b5fbda49605f0416a2c975d66e9e6
author Florian Tobias Schandinat <FlorianSchandinat@gmx.de> 1343206546 +0000
committer Florian Tobias Schandinat <FlorianSchandinat@gmx.de> 1343206546 +0000

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