summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-27 22:51:00 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-27 22:51:00 +0000
commit0782e5bb57e16428de32f0f933c77324b186193f (patch)
treedc7770ce6bc2dbf703799ba1aecae9b2085020da /arch/arm/boot
parent017c899c2db3da481cc174049e47307ed3aba530 (diff)
parent3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff)
parentbad134090385d577e9ecabef83f8fa737eb7a1af (diff)
Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc
Dependencies for tegra/soc branch Conflicts: arch/arm/mach-tegra/board-dt.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>