Merge branch 'tegra/soc' into next/drivers

Browse source

This is a dependency for the tegra/clk branch.

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

Conflicts:
	drivers/clocksource/tegra20_timer.c

...

This commit is contained in:

Arnd Bergmann 2013-04-09 17:07:36 +02:00

parent 86feb64f5b 38be85de69

commit 1194b152cd

44 changed files with 1192 additions and 553 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

36

drivers/clk/tegra/clk-tegra20.c

View file

4

drivers/clocksource/tegra20_timer.c

View file

21

drivers/gpio/gpio-tegra.c

View file