Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub...
authorPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)
commitd15660a1e6b70c75456c72050e52af63bbeb05a3
tree5f2fbd338727f13669dcee5c41f9a936880b1ac0
parenta6b5825aa703714523a745a8e050b9d6105f6704
parentebe5e12d00f4785092a9650845ad3451bbf4b311
parent3fedd2ac7662a10ab2973d3b6f11cdce87b7171a
Merge branches 'common/fbdev' and 'common/fbdev-meram' of /linux/kernel/git/lethal/sh-2.6
drivers/video/Kconfig
drivers/video/sh_mobile_lcdcfb.c