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

diff --cc arch/arm/include/asm/mach/arch.h
Simple merge

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

diff --cc include/linux/of.h
index ea44fd72af5fb02e02550e2163e4e7860eacf301,9abd3ec3c2ac1e54a53cc2d2961d92ecda679a89..a75a831e2057f96e3519d100f988a584e18ac669
--- 1/include/linux/of.h
--- 2/include/linux/of.h
+++ b/include/linux/of.h
@@@ -65,13 -65,20 +65,27 @@@ struct device_node 
  #endif
  };
  
 +#define MAX_PHANDLE_ARGS 8
 +struct of_phandle_args {
 +      struct device_node *np;
 +      int args_count;
 +      uint32_t args[MAX_PHANDLE_ARGS];
 +};
 +
+ #if defined(CONFIG_SPARC) || !defined(CONFIG_OF)
+ /* Dummy ref counting routines - to be implemented later */
+ static inline struct device_node *of_node_get(struct device_node *node)
+ {
+       return node;
+ }
+ static inline void of_node_put(struct device_node *node)
+ {
+ }
+ #else
+ extern struct device_node *of_node_get(struct device_node *node);
+ extern void of_node_put(struct device_node *node);
+ #endif
+ 
  #ifdef CONFIG_OF
  
  /* Pointer for first entry in chain of all nodes. */

diff --cc kernel/irq/irqdomain.c
Simple merge