Skip to content
Commit f8da810c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 03e86b3a 964ea475
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment