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
..
boot	Kbuild: Use dtc's -d (dependency) option	2012-02-14 21:14:44 -05:00
configs	C6X: build infrastructure	2011-10-06 19:47:25 -04:00
include/asm	Merge branch 'spear/dt' into next/dt2	2012-03-16 20:25:17 +00:00
kernel	irq_domain/c6x: Use library of xlate functions	2012-02-16 06:11:24 -07:00
lib	C6X: library code	2011-10-06 19:48:23 -04:00
mm	C6X: memory management and DMA support	2011-10-06 19:47:37 -04:00
platforms	irq_domain/c6x: Use library of xlate functions	2012-02-16 06:11:24 -07:00
Kconfig	irq_domain/c6x: Convert c6x to use generic irq_domain support.	2012-02-16 06:11:24 -07:00
Makefile	C6X: build infrastructure	2011-10-06 19:47:25 -04:00