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

Merge branch 'tegra/soc' into next/drivers 



This is a dependency for the tegra/clk branch.

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

Conflicts:
	drivers/clocksource/tegra20_timer.c
parents 86feb64f 38be85de
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment