git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a0543d6 0e622d3)
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Nov 2012 22:36:06 +0000 (12:36 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Nov 2012 22:36:06 +0000 (12:36 -1000)
commit5e351cdc998db82935d1248a053a1be37d1160fd
tree6d1e1447abb053056400a13aa4a7932a6d5a89e1tree
parenta0543d64388146f83ff7aef4abb42f8fd074d5e0commit | diff
parent0e622d39197f0b64b9e043fe75ac3634bf9f3a05commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.