1
linux/arch/sparc
Linus Torvalds 03c0c29aff 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.
2010-08-05 15:57:35 -07:00
..
boot Merge branch 'master' into for-next 2010-06-16 18:08:13 +02:00
configs sparc64: Update defconfig. 2010-05-26 21:18:23 -07:00
include/asm of: Provide default of_node_to_nid() implementation. 2010-07-30 00:03:58 -06:00
kernel of: make of_find_device_by_node generic 2010-07-24 09:58:22 -06:00
lib sparc64: Allocate sufficient stack space in ftrace stubs. 2010-04-13 18:59:02 -07:00
math-emu Revert "endian: #define __BYTE_ORDER" 2010-05-26 08:30:15 -07:00
mm Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-05 15:57:35 -07:00
oprofile sparc: using HZ needs an include of linux/param.h 2009-10-05 00:46:08 -07:00
prom sparc64: Make prom entry spinlock NMI safe. 2010-03-03 09:06:03 -08:00
Kconfig Merge commit 'v2.6.35-rc6' into devicetree/next 2010-07-24 09:49:13 -06:00
Kconfig.debug sparc64: Kill CONFIG_STACK_DEBUG code. 2010-04-12 22:36:03 -07:00
Makefile sparc: Set UTS_MACHINE correctly. 2009-12-05 17:17:55 -08:00