From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Jan 2012 20:18:52 +0000 (-0800)
Subject: Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.3-rc1~171
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02550d61f49266930e674286379d3601006b2893;p=pandora-kernel.git

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

devicetree/next changes queued for v3.3 merge window

* tag 'devicetree-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
  ARM: prom.h: Fix build error by removing unneeded header file
  irq: check domain hwirq range for DT translate
  dt: add empty of_get_node/of_put_node functions
  of/pdt: fix section mismatch warning
  i2c-designware: add OF binding support
  dt/i2c: Enumerate some of the known trivial i2c devices
  dt: reform for_each_property to for_each_property_of_node
  ARM/of: allow *machine_desc.dt_compat to be const
  of/base: Take NULL string into account for property with multiple strings
  OF/device-tree: Add some entries to vendor-prefixes.txt

Fix up trivial add-add conflicts in include/linux/of.h
---

02550d61f49266930e674286379d3601006b2893
Reading git-diff-tree failed