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

Merge branch 'tegra/clk' into next/dt2

This is a dependency for the tegra/dt branch.

Conflicts:
	drivers/clocksource/tegra20_timer.c

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

f8da810cbb823c9781d703319ac4303568008fae
Reading git-diff-tree failed