| commit | d9053b487965042b9c849ce40c7f1fb7a0b84b39 | [log] [tgz] |
|---|---|---|
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | Wed Jul 25 08:55:46 2012 +0000 |
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | Wed Jul 25 08:55:46 2012 +0000 |
| tree | 1fbb2559dd8fd400cf1dff5711cc5e408ea79ef6 | |
| parent | 4c5b1fb8a1348542afb153aef72f6067989f578e [diff] | |
| parent | 974a65825e0b5fbda49605f0416a2c975d66e9e6 [diff] |
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