Arnd Bergmann a94c7b0a8f 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>

2012-03-16 20:25:17 +00:00

..

bindings

Merge branch 'spear/dt' into next/dt2

2012-03-16 20:25:17 +00:00

00-INDEX

Documentation: add devicetree docs index file

2011-03-16 10:47:03 -07:00

booting-without-of.txt

dt: add documentation of ARM dt boot interface

2011-05-23 09:30:20 -06:00