Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub...

author Paul Mundt <[email protected]>

Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)

committer Paul Mundt <[email protected]>

Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)
author Paul Mundt <[email protected]>
Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)
committer Paul Mundt <[email protected]>
Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)
diff --cc drivers/video/Kconfig
Simple merge
diff --cc drivers/video/sh_mobile_lcdcfb.c
Simple merge
author	Paul Mundt <[email protected]>
	Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)
committer	Paul Mundt <[email protected]>
	Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)
		1	2	3
drivers/video/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/video/sh_mobile_lcdcfb.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history