| commit | dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8 | [log] [tgz] |
|---|---|---|
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | Fri Nov 16 11:42:46 2012 +0200 |
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | Fri Nov 16 11:42:46 2012 +0200 |
| tree | fb198f6a52f4790ea2468a421fc8c91a3b3648c8 | |
| parent | 3c3dd225819112e56554162c6b37e61a31924e0c [diff] | |
| parent | 966458f89d84ef5792893a01e2b7a5218c7b311d [diff] |
Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux Conflicts: drivers/video/omap2/dss/Kconfig drivers/video/omap2/omapfb/omapfb-ioctl.c drivers/video/omap2/omapfb/omapfb-main.c Merge changes to make omapfb use common dma_alloc, and remove omap's custom vram allocator.