Merge branch 'rmobile/core' into rmobile/marzen
authorPaul Mundt <lethal@linux-sh.org>
Tue, 10 Jan 2012 04:16:37 +0000 (13:16 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 10 Jan 2012 04:16:37 +0000 (13:16 +0900)
commitea75b9c127e67683a11f7c9c8e052172f28d9266
tree707d616bc44bb7ad251cc92985a586a8e34c3426
parent916b1f8c81ea563611288d1a9b082df3f723e4fe
parent1229835ccb6d7ea2b36230121205be95c88eca88
Merge branch 'rmobile/core' into rmobile/marzen
arch/arm/mach-shmobile/include/mach/common.h