]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 16 Nov 2012 09:42:46 +0000 (11:42 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 16 Nov 2012 09:42:46 +0000 (11:42 +0200)
commit679344c18bd6145b549f8431f0ad55251d857261
treefb198f6a52f4790ea2468a421fc8c91a3b3648c8
parent3de1641f3df31d0b9d93c4abacbb56d61ddd9206
parent777127a232399194cdf73f7f5b911132ecfc427a
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.
arch/arm/plat-omap/fb.c
drivers/video/omap2/dss/Kconfig
drivers/video/omap2/omapfb/omapfb-ioctl.c
drivers/video/omap2/omapfb/omapfb-main.c