| commit | 474ff6b8a79093aea966b6246d5b8000de124da9 | [log] [tgz] |
|---|---|---|
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | Mon Nov 26 10:26:29 2012 +0200 |
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | Mon Nov 26 10:26:29 2012 +0200 |
| tree | c73caeaeef6d800ca8795687294ed2cbd74607db | |
| parent | 9b76c9cdece2b14a23bfddd765f6dac1dd4d0120 [diff] | |
| parent | 8ad9375f8b7c709b89f7de4de413bb2644ba3c24 [diff] |
Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux omapdss fixes for 3.7-rc Conflicts: drivers/video/omap2/dss/dss.c