From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Dec 2012 23:37:46 +0000 (-0800)
Subject: Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.8-rc1~105
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4939e27d46fee2609f2112f85f7f7cbd952075dc;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

Pull another devicetree update from Grant Likely:
 "Here's a couple more devicetree changes that I missed in the first
  pull by putting the tag in the wrong place.

  Two minor devicetree fixups for v3.8.  Addition of dummy inlines and
  constification of node argument to of_parse_phandle_with_args()."

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  of: *node argument to of_parse_phandle_with_args should be const
  of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't defined
---

4939e27d46fee2609f2112f85f7f7cbd952075dc