1
0
Fork 0
alistair23-linux/drivers/of
Linus Torvalds 0bd2cbcdfa Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
  of/flattree: forward declare struct device_node in of_fdt.h
  ipmi: explicitly include of_address.h and of_irq.h
  sparc: explicitly cast negative phandle checks to s32
  powerpc/405: Fix missing #{address,size}-cells in i2c node
  powerpc/5200: dts: refactor dts files
  powerpc/5200: dts: Change combatible strings on localbus
  powerpc/5200: dts: remove unused properties
  powerpc/5200: dts: rename nodes to prepare for refactoring dts files
  of/flattree: Update dtc to current mainline.
  of/device: Don't register disabled devices
  powerpc/dts: fix syntax bugs in bluestone.dts
  of: Fixes for OF probing on little endian systems
  of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
  of/flattree: Add of_flat_dt_match() helper function
  of_serial: explicitly include of_irq.h
  of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
  of/flattree: Reorder unflatten_dt_node
  of/flattree: Refactor unflatten_dt_node
  of/flattree: Add non-boottime device tree functions
  of/flattree: Add Kconfig for EARLY_FLATTREE
  ...

Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.
2011-01-10 08:57:03 -08:00
..
Kconfig of/flattree: Add Kconfig for EARLY_FLATTREE 2010-12-29 16:08:18 -07:00
Makefile of/net: Move of_get_mac_address() to a common source file. 2010-11-01 01:08:14 -04:00
address.c of/address: use proper endianess in get_flags 2010-12-23 15:57:48 -07:00
base.c of: use __be32 types for big-endian device tree data 2010-10-12 21:58:42 -06:00
device.c of/device: Rework to use common platform_device_alloc() for allocating devices 2010-10-21 11:10:10 -06:00
fdt.c of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
gpio.c of/gpio: fix of_gpio includes 2010-07-05 16:14:44 -06:00
irq.c of/irq: remove references to NO_IRQ in drivers/of/platform.c 2010-10-12 21:58:27 -06: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 some endianness problems. 2010-12-24 01:25:54 -07:00
of_net.c of/net: Move of_get_mac_address() to a common source file. 2010-11-01 01:08:14 -04:00
of_spi.c of/spi: call of_register_spi_devices() from spi core code 2010-07-30 00:03:59 -06:00
pdt.c of/promtree: add package-to-path support to pdt 2010-10-12 21:58:08 -06:00
platform.c of/device: Don't register disabled devices 2011-01-03 16:02:49 -07:00