Merge tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 16:44:08 +0000 (09:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 16:44:08 +0000 (09:44 -0700)
commita54dfb1a845c38a97686268d8c4086a63d9493aa
tree3b31c81672fa89102aae929cc6c1e48e6e9382f4
parenteb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7
parent36165f55055781a0e4bf32d775241796414504b0
Merge tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux

Pull devicetree updates from Rob Herring:
 - Import of latest upstream device tree compiler (dtc)
 - New function of_get_child_by_name
 - Support for #size-cells of 0 and #addr-cells of >2
 - Couple of DT binding documentation updates

Fix up trivial conflicts due to of_get_child_by_name() having been added
next to the new of_get_next_available_child().

* tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux:
  MAINTAINERS: add scripts/dtc under Devicetree maintainers
  dtc: import latest upstream dtc
  dt: Document general interrupt controller bindings
  dt/s3c64xx/spi: Use of_get_child_by_name to get a named child
  dt: introduce of_get_child_by_name to get child node by name
  of: i2c: add support for wakeup-source property
  of/address: Handle #address-cells > 2 specially
  DT: export of_irq_to_resource_table()
  devicetree: serial: Add documentation for imx serial
  devicetree: pwm: mxs-pwm.txt: Fix reg field annotation
  of: Allow busses with #size-cells=0
MAINTAINERS
drivers/of/base.c
drivers/spi/spi-s3c64xx.c
include/linux/of.h