linux/drivers/of
Arnd Bergmann 66a2886d86 Merge branch 'spear/dt' into spear/clock
Conflicts:
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear3xx/include/mach/misc_regs.h
	arch/arm/mach-spear3xx/spear320.c
	arch/arm/mach-spear6xx/clock.c
	arch/arm/mach-spear6xx/include/mach/misc_regs.h

Resolve even more merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14 17:31:45 +02:00
..
Kconfig ARM: More device tree support updates 2012-03-28 12:34:33 -07:00
Makefile of/mtd/nand: add generic bindings and helpers 2012-03-15 23:28:19 +08:00
address.c ARM: spear: remove most mach/*.h header contents 2012-04-22 22:44:04 +02:00
base.c dt: add property iteration helpers 2012-04-18 13:53:11 +02:00
device.c drivercore: Output common devicetree information in uevent 2012-02-01 14:26:30 -07:00
fdt.c of/fdt.c: asm/setup.h included twice 2012-02-27 10:09:25 -06:00
gpio.c gpio: Fix range check in of_gpio_simple_xlate() 2012-04-10 14:20:56 -06:00
irq.c of/irq: Add interrupts-names property to name an irq resource 2012-01-04 00:33:15 -07: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.c of: of_pci.c needs export.h since it uses EXPORT_SYMBOLS 2011-10-31 19:31:14 -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_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 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:30:49 -07:00
selftest.c of: Add of_property_match_string() to find index into a string list 2012-01-28 10:29:20 -07:00