From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Fri, 16 Nov 2012 09:42:46 +0000 (+0200)
Subject: Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~2^2^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8;p=pandora-kernel.git

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.
---

dcca5cf07bcd355e4e1bd51609efe7b7d5d0a7b8
Reading git-diff-tree failed