]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit18e492dae8c34f18ea565e7146e466201b6f5b6b
tree1fbb2559dd8fd400cf1dff5711cc5e408ea79ef6
parent8c2e560e0886fa76b74f8bd17f6c92709dfab34b
parentf60feaa1087973c633531f23062e0a9c7527327d
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