From: Olof Johansson <olof@lixom.net>
Date: Sun, 26 Feb 2012 22:43:43 +0000 (-0800)
Subject: Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp
X-Git-Tag: v3.4-rc1~72^2~4^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f830e5c902106e7fe51460fd1e3263bea72bf41;p=pandora-kernel.git

Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp

Conflicts:
	arch/arm/mach-tegra/Makefile
---

0f830e5c902106e7fe51460fd1e3263bea72bf41
Reading git-diff-tree failed