]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2012 20:18:52 +0000 (12:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2012 20:18:52 +0000 (12:18 -0800)
commit02550d61f49266930e674286379d3601006b2893
tree2d30df688b7f428908028dd20e83b22bc799dee7
parent2d51daaa615e4724f24e43fa01e705c40551080a
parentc89810acbcf48c7004e912b2b4b862480b2d00e1
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
arch/arm/include/asm/mach/arch.h
drivers/of/base.c
include/linux/of.h
kernel/irq/irqdomain.c