projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78
treecac33ce0abaaeb56b6e08a396cb7ff4e3e3b8f61tree
parentd4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3commit | diff
parent9652e8bd16e73f7a34cabf1ab114aaa5c97db660commit | diff
Merge branch 'spear/dt' into next/dt2

* 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>
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-ux500/Kconfig diff1 | diff2 | blob | history
drivers/mmc/host/mmci.c diff1 | diff2 | blob | history
include/linux/of.h diff1 | diff2 | blob | history
MicroBlaze GIT Repository