From: Olof Johansson <olof@lixom.net>
Date: Wed, 28 Mar 2012 00:19:15 +0000 (-0700)
Subject: Merge branch 'tegra/soc' into next/cleanup2
X-Git-Tag: v3.4-rc1~34^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b521d929b330d665cb3a42b26eaaa5690dc9dad7;p=pandora-kernel.git

Merge branch 'tegra/soc' into next/cleanup2

Conflicts:
	arch/arm/mach-tegra/Makefile

Signed-off-by: Olof Johansson <olof@lixom.net>
---

b521d929b330d665cb3a42b26eaaa5690dc9dad7
Reading git-diff-tree failed