Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 22:57:35 +0000 (15:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 22:57:35 +0000 (15:57 -0700)
commit03c0c29aff7e56b722eb6c47eace222b140d0377
tree47267a19b523159cf36a050ef3c35f4dbdb33016
parentc60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4
parent7fb8f881c54beb05dd4d2c947dada1c636581d87
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits)
  of/platform: Register of_platform_drivers with an "of:" prefix
  of/address: Clean up function declarations
  of/spi: call of_register_spi_devices() from spi core code
  of: Provide default of_node_to_nid() implementation.
  of/device: Make of_device_make_bus_id() usable by other code.
  of/irq: Fix endian issues in parsing interrupt specifiers
  of: Fix phandle endian issues
  of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
  of: remove of_default_bus_ids
  of: make of_find_device_by_node generic
  microblaze: remove references to of_device and to_of_device
  sparc: remove references to of_device and to_of_device
  powerpc: remove references to of_device and to_of_device
  of/device: Replace of_device with platform_device in includes and core code
  of/device: Protect against binding of_platform_drivers to non-OF devices
  of: remove asm/of_device.h
  of: remove asm/of_platform.h
  of/platform: remove all of_bus_type and of_platform_bus_type references
  of: Merge of_platform_bus_type with platform_bus_type
  drivercore/of: Add OF style matching to platform bus
  ...

Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
some obj-y removals by the devicetree branch, while the microblaze
updates added a new file.
22 files changed:
arch/microblaze/Kconfig
arch/microblaze/include/asm/page.h
arch/microblaze/kernel/Makefile
arch/microblaze/kernel/irq.c
arch/powerpc/Kconfig
arch/powerpc/include/asm/topology.h
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/platforms/512x/clock.c
arch/powerpc/platforms/powermac/feature.c
arch/sparc/mm/iommu.c
drivers/char/hw_random/n2-drv.c
drivers/crypto/n2_core.c
drivers/gpio/gpiolib.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/ibm_newemac/core.c
drivers/net/niu.c
drivers/sbus/char/display7seg.c
drivers/sbus/char/envctrl.c
drivers/sbus/char/flash.c
drivers/sbus/char/uctrl.c