From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Nov 2012 22:36:06 +0000 (-1000)
Subject: Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: MMI-PSA29.97-13-9~15513
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5e351cdc998db82935d1248a053a1be37d1160fd;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull device tree regression fix from Grant Likely:
 "Simple build regression fix for DT device drivers on Sparc.  An
  earlier change had masked out the of_iomap() helper on SPARC."

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  of/address: sparc: Declare of_iomap as an extern function for sparc again
---

5e351cdc998db82935d1248a053a1be37d1160fd