From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 30 Nov 2010 05:53:45 +0000 (+0900)
Subject: Merge branch 'rmobile/mackerel' into rmobile-latest
X-Git-Tag: v2.6.38-rc1~462^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2818b19102fdc414248f772c46af176d36520ae7;p=pandora-kernel.git

Merge branch 'rmobile/mackerel' into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

2818b19102fdc414248f772c46af176d36520ae7
Reading git-diff-tree failed