From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Dec 2009 15:46:56 +0000 (-0800)
Subject: Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.12-rc1~12162
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ad1f3b35e8309ec93454dbf89beaafcdb5312da;p=kernel%2Fkernel-generic.git

Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
  of: merge of_find_all_nodes() implementations
  of: merge other miscellaneous prototypes
  of: merge of_*_flat_dt*() functions
  of: merge of_node_get(), of_node_put() and of_find_all_nodes()
  of: merge of_read_number() an of_read_ulong()
  of: merge of_node_*_flag() and set_node_proc_entry()
  of: merge struct boot_param_header from Microblaze and PowerPC
  of: add common header for flattened device tree representation
  of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h
  of: merge struct device_node
  of: merge phandle, ihandle and struct property
  of: Rework linux/of.h and asm/prom.h include ordering
---

3ad1f3b35e8309ec93454dbf89beaafcdb5312da