summaryrefslogtreecommitdiffstats
path: root/drivers/video/sis
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-10 09:14:42 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-11-10 09:14:42 +0100
commit7ac3d3ebf1f6e2051472150092a6d023043dd0f1 (patch)
treed72bc54c2f0ffd77abbb2fd014328be250e1b6b1 /drivers/video/sis
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt... (diff)
parentMerge branch 'common/fbdev' into fbdev-driver-fixes (diff)
downloadlinux-7ac3d3ebf1f6e2051472150092a6d023043dd0f1.tar.xz
linux-7ac3d3ebf1f6e2051472150092a6d023043dd0f1.zip
Merge branch 'fbdev-driver-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 into fbdev-fixes-for-linus
Diffstat (limited to 'drivers/video/sis')
0 files changed, 0 insertions, 0 deletions