Merge branch 'rmobile/core' into rmobile/marzen

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

Tue, 10 Jan 2012 04:16:37 +0000 (13:16 +0900)

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

Tue, 10 Jan 2012 04:16:37 +0000 (13:16 +0900)
author Paul Mundt <lethal@linux-sh.org>
Tue, 10 Jan 2012 04:16:37 +0000 (13:16 +0900)
committer Paul Mundt <lethal@linux-sh.org>
Tue, 10 Jan 2012 04:16:37 +0000 (13:16 +0900)
diff --cc arch/arm/mach-shmobile/include/mach/common.h
Simple merge
author	Paul Mundt <lethal@linux-sh.org>
	Tue, 10 Jan 2012 04:16:37 +0000 (13:16 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Tue, 10 Jan 2012 04:16:37 +0000 (13:16 +0900)