Arnd Bergmann f907ab06bb Merge branch 'next/fixes-non-critical' into next/drivers ... Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c The conflicts with pxa are non-obvious, we have multiple branches adding and removing the same clock settings. According to Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct fix here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-20 22:42:24 +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: Add device tree selftests	2011-12-12 13:40:16 -07:00
Makefile	of: Add device tree selftests	2011-12-12 13:40:16 -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_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 'depends/irqdomain' into next/drivers	2012-03-05 16:58:11 +00:00
selftest.c	of: Add device tree selftests	2011-12-12 13:40:16 -07:00