Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 25 Jul 2012 08:55:46 +0000 (08:55 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 25 Jul 2012 08:55:46 +0000 (08:55 +0000)
commitd9053b487965042b9c849ce40c7f1fb7a0b84b39
tree1fbb2559dd8fd400cf1dff5711cc5e408ea79ef6
parent4c5b1fb8a1348542afb153aef72f6067989f578e
parent974a65825e0b5fbda49605f0416a2c975d66e9e6
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