summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-05-24 08:49:57 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-05-24 08:49:57 +0200
commitd15660a1e6b70c75456c72050e52af63bbeb05a3 (patch)
tree5f2fbd338727f13669dcee5c41f9a936880b1ac0 /drivers/video
parentMerge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux (diff)
parentfbdev: sh_mobile_lcdc: remove runtime PM calls from the notifier (diff)
parentsh_mobile_meram: Add support for NV24 framebuffers (diff)
downloadlinux-d15660a1e6b70c75456c72050e52af63bbeb05a3.tar.xz
linux-d15660a1e6b70c75456c72050e52af63bbeb05a3.zip
Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6