| commit | 9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262 | [log] [tgz] |
|---|---|---|
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | Thu May 10 19:55:44 2012 +0300 |
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | Thu May 10 20:24:14 2012 +0300 |
| tree | d034047d7cd562700c59a0b1b3ba707367939fe7 | |
| parent | 1dfafbc655b3723e37120d4b30e82d1c87767dd1 [diff] | |
| parent | e4a9e94cc58ed6e4efb02b80be3a9bf57f448d07 [diff] |
Merge branch 'for-l-o-3.5' Conflicts: drivers/video/omap2/displays/panel-taal.c Merge OMAP DSS related board file changes. The branch will also be merged through linux-omap tree to solve conflicts.