git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4ef467 9652e8b)
Merge branch 'spear/dt' into next/dt2
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 20:25:17 +0000 (20:25 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 20:25:17 +0000 (20:25 +0000)
* spear/dt:
  ARM: SPEAr600: Add device-tree support to SPEAr600 boards

(update to v3.3-rc7)

Conflicts:
arch/arm/mach-spear6xx/spear6xx.c
arch/arm/mach-vexpress/Kconfig

The conflicts are between the previous contents of the next/dt2
branch and upstream changes from v3.3-rc7.

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

Trivial merge
Pandora Kernel Repository