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

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

Wed, 5 Jan 2011 08:30:20 +0000 (17:30 +0900)

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

Wed, 5 Jan 2011 08:30:20 +0000 (17:30 +0900)
author Paul Mundt <lethal@linux-sh.org>
Wed, 5 Jan 2011 08:30:20 +0000 (17:30 +0900)
committer Paul Mundt <lethal@linux-sh.org>
Wed, 5 Jan 2011 08:30:20 +0000 (17:30 +0900)
diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge
diff --cc arch/arm/mach-shmobile/clock-sh7372.c
Simple merge
author	Paul Mundt <lethal@linux-sh.org>
	Wed, 5 Jan 2011 08:30:20 +0000 (17:30 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Wed, 5 Jan 2011 08:30:20 +0000 (17:30 +0900)
		1	2
arch/arm/mach-shmobile/board-ap4evb.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-sh7372.c	patch \|	diff1 \|	diff2 \|	blob \| history