Merge branch 'common/fbdev' of master.kernel.org:/pub/scm/linux/kernel/git/lethal...

author Paul Mundt <lethal@linux-sh.org>

Tue, 29 Mar 2011 07:06:21 +0000 (16:06 +0900)

committer Paul Mundt <lethal@linux-sh.org>

Tue, 29 Mar 2011 07:06:21 +0000 (16:06 +0900)
author Paul Mundt <lethal@linux-sh.org>
Tue, 29 Mar 2011 07:06:21 +0000 (16:06 +0900)
committer Paul Mundt <lethal@linux-sh.org>
Tue, 29 Mar 2011 07:06:21 +0000 (16:06 +0900)
diff --cc arch/sh/boards/mach-ecovec24/setup.c
Simple merge
diff --cc drivers/video/sh_mobile_lcdcfb.c
Simple merge
diff --cc drivers/video/sh_mobile_lcdcfb.h
Simple merge
author	Paul Mundt <lethal@linux-sh.org>
	Tue, 29 Mar 2011 07:06:21 +0000 (16:06 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Tue, 29 Mar 2011 07:06:21 +0000 (16:06 +0900)
		1	2
arch/sh/boards/mach-ecovec24/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/sh_mobile_lcdcfb.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/sh_mobile_lcdcfb.h	patch \|	diff1 \|	diff2 \|	blob \| history