Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux

Pull devicetree updates from Rob Herring:
 "A small set of changes for devicetree:
   - Couple of Documentation fixes
   - Addition of new helper function of_node_full_name
   - Improve of_parse_phandle_with_args return values
   - Some NULL related sparse fixes"

Grant's busy packing.

* tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux:
  of: mtd: nuke useless const qualifier
  devicetree: add helper inline for retrieving a node's full name
  of: return -ENOENT when no property
  usage-model.txt: fix typo machine_init->init_machine
  of: Fix null pointer related warnings in base.c file
  LED: Fix missing semicolon in OF documentation
  of: fix a few typos in the binding documentation

diff --cc arch/powerpc/kernel/pci-common.c
Simple merge

diff --cc arch/powerpc/kernel/vio.c
Simple merge

diff --cc arch/powerpc/platforms/cell/iommu.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/iommu.c
Simple merge

diff --cc drivers/of/base.c
Simple merge

diff --cc include/linux/of.h
Simple merge