From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Aug 2010 22:57:35 +0000 (-0700)
Subject: Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=03c0c29aff7e56b722eb6c47eace222b140d0377;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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.
---

03c0c29aff7e56b722eb6c47eace222b140d0377
diff --cc arch/microblaze/kernel/Makefile
index 5eecc9f1fbd9,7fcc5f7b5a46..f0cb5c26c81c
--- a/arch/microblaze/kernel/Makefile
+++ b/arch/microblaze/kernel/Makefile
@@@ -15,9 -15,9 +15,9 @@@ endi
  extra-y := head.o vmlinux.lds
  
  obj-y += dma.o exceptions.o \
- 	hw_exception_handler.o init_task.o intc.o irq.o of_device.o \
- 	of_platform.o process.o prom.o prom_parse.o ptrace.o \
+ 	hw_exception_handler.o init_task.o intc.o irq.o \
+ 	process.o prom.o prom_parse.o ptrace.o \
 -	setup.o signal.o sys_microblaze.o timer.o traps.o reset.o
 +	reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
  
  obj-y += cpu/