From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 6 Jan 2012 23:09:14 +0000 (+0000)
Subject: Merge branch 'tegra/soc' into next/boards
X-Git-Tag: v3.3-rc1~140^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e067096c8d57d191f29d734cd5692695c95cc36e;p=pandora-kernel.git

Merge branch 'tegra/soc' into next/boards

Conflicts:
	arch/arm/mach-tegra/board-harmony-pcie.c

To fix an internal merge conflict between the tegra/soc and tegra/boards
branches.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

e067096c8d57d191f29d734cd5692695c95cc36e
Reading git-diff-tree failed