From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 9 Apr 2013 15:07:36 +0000 (+0200)
Subject: Merge branch 'tegra/soc' into next/drivers
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~47^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1194b152cd4eff475652785ce366b20afe82dfcf;p=pandora-kernel.git

Merge branch 'tegra/soc' into next/drivers

This is a dependency for the tegra/clk branch.

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

Conflicts:
	drivers/clocksource/tegra20_timer.c
---

1194b152cd4eff475652785ce366b20afe82dfcf
Reading git-diff-tree failed