Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 22:51:00 +0000 (22:51 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 22:51:00 +0000 (22:51 +0000)
Dependencies for tegra/soc branch

Conflicts:
  arch/arm/mach-tegra/board-dt.c

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

Trivial merge