Merge branch 'depends/rmk/for-linus' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Sat, 7 Jan 2012 20:53:13 +0000 (20:53 +0000)
committerArnd Bergmann <arnd@arndb.de>
Sat, 7 Jan 2012 20:53:13 +0000 (20:53 +0000)
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c


Trivial merge