Merge branch 'tegra/fixes' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 13:26:51 +0000 (15:26 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 13:26:51 +0000 (15:26 +0200)
commit5be8f6368800d9e3e570373d2aaff8a48be36574
tree1a874b8668abbf9cfa24fdf917a9c4468acb468f
parentf199ab1aab9d790bee6c84bdb476f1e4911b8011
parenteebd1fda2342014a50ed3fd132e5dc6e8b5251e8
Merge branch 'tegra/fixes' into next/cleanup

This is a dependency for tegra/cleanups

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-tegra/platsmp.c
drivers/clk/tegra/clk-tegra20.c