git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3c3dd22
966458f
)
Merge branch '3.8/vram-conversion' of git://gitorious.org/linux-omap-dss2/linux
author
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Fri, 16 Nov 2012 09:42:46 +0000
(11:42 +0200)
committer
Tomi Valkeinen
<tomi.valkeinen@ti.com>
Fri, 16 Nov 2012 09:42:46 +0000
(11:42 +0200)
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.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff