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
..
address.c	of/address: Add reg-names property to name an iomem resource	2012-01-04 00:27:22 -07:00
base.c	devicetree/next changes queued for v3.3 merge window	2012-01-07 12:18:52 -08:00
device.c	dt/powerpc: move of_bus_type infrastructure to ibmebus	2011-02-28 01:36:38 -07:00
fdt.c	of/fdt.c: asm/setup.h included twice	2012-02-27 10:09:25 -06:00
gpio.c	of: create of_phandle_args to simplify return of phandle parsing data	2011-12-12 13:40:16 -07:00
irq.c	of/irq: Add interrupts-names property to name an irq resource	2012-01-04 00:33:15 -07:00
Kconfig	of/mtd/nand: add generic bindings and helpers	2012-03-15 23:28:19 +08:00
Makefile	of/mtd/nand: add generic bindings and helpers	2012-03-15 23:28:19 +08:00
of_i2c.c	of/i2c: Fix request module by alias	2010-12-24 01:28:54 -07:00
of_mdio.c	of/mdio: fix fixed link bus name	2012-02-27 10:09:52 -06:00
of_mtd.c	of/mtd/nand: add generic bindings and helpers	2012-03-15 23:28:19 +08:00
of_net.c	drivers/of: include export.h for EXPORT_SYMBOL_GPL/THIS_MODULE as required	2011-10-31 19:31:56 -04:00
of_pci_irq.c	drivers/of: include export.h for EXPORT_SYMBOL_GPL/THIS_MODULE as required	2011-10-31 19:31:56 -04:00
of_pci.c	of: of_pci.c needs export.h since it uses EXPORT_SYMBOLS	2011-10-31 19:31:14 -04:00
of_spi.c	drivers/of: Add module.h to of_spi.c	2011-10-31 19:31:55 -04:00
pdt.c	of/pdt: fix section mismatch warning	2011-12-27 16:37:30 -06:00
platform.c	Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6	2012-03-01 13:26:51 +01:00
selftest.c	of: Add device tree selftests	2011-12-12 13:40:16 -07:00