From: Simon Horman <horms+renesas@verge.net.au>
Date: Tue, 6 Aug 2013 09:06:53 +0000 (+0900)
Subject: Merge branch 'dt2' into cleanup3-base
X-Git-Tag: v3.12-rc1~76^2~1^2~26
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793;p=pandora-kernel.git

Merge branch 'dt2' into cleanup3-base

Conflicts:
	arch/arm/mach-shmobile/Makefile.boot
---

4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793
Reading git-diff-tree failed