diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-11 11:28:59 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-11 11:28:59 +0300 |
| commit | 6659145746bcf01ac650c76e5736c5003c2db230 (patch) | |
| tree | d21884a7f7e20381e908f87c3682026ed6761efc /tools/perf/scripts/python/bin | |
| parent | Merge miscellaneous omapdss changes (diff) | |
| parent | OMAPFB: fix framebuffer console colors (diff) | |
| download | linux-6659145746bcf01ac650c76e5736c5003c2db230.tar.gz linux-6659145746bcf01ac650c76e5736c5003c2db230.zip | |
Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6
Merge omapfb and OMAP SDI fixes:
* OMAPFB: fix framebuffer console colors
* OMAPDSS: Fix SDI PLL locking
Conflicts:
drivers/video/omap2/dss/sdi.c
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions